(improvement)(headless) Merge server and core in headless-api (#590)

(improvement)(headless) Merge server and core in headless-api

---------

Co-authored-by: jolunoluo

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum AggOption {
     NATIVE,

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum AppStatus {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 
 import com.tencent.supersonic.common.pojo.Constants;

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java

@@ -0,0 +1,9 @@
+package com.tencent.supersonic.headless.api.enums;
+
+
+public enum DimensionType {
+
+    categorical,
+    time
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java

@@ -0,0 +1,8 @@
+package com.tencent.supersonic.headless.api.enums;
+
+public enum IdentifyType {
+
+    primary,
+    foreign,
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java

@@ -0,0 +1,9 @@
+package com.tencent.supersonic.headless.api.enums;
+
+
+public enum MetricType {
+
+    ATOMIC,
+    DERIVED
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 import java.util.Objects;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum QueryOptMode {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 
 public enum QueryType {

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 
 public enum QueryTypeBack {

headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.enums;
+package com.tencent.supersonic.headless.api.enums;
 
 public enum SemanticType {
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/AppConfig.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Cache.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Dim.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.tencent.supersonic.common.pojo.Constants;
 import lombok.AllArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimValueMap.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimensionTimeTypeParams.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DrillDownDimension.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Entity.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Identify.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Item.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.enums.ApiItemType;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ItemDateFilter.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import java.util.List;
 import lombok.AllArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Measure.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricQueryDefaultConfig.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.tencent.supersonic.common.pojo.RecordInfo;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
-import com.tencent.supersonic.headless.common.core.enums.AggOption;
+import com.tencent.supersonic.headless.api.enums.AggOption;
 import lombok.Data;
 
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeParams.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import java.util.List;
 import com.google.common.collect.Lists;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.enums.DimensionType;
+import com.tencent.supersonic.headless.api.enums.DimensionType;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryStat.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/RelateDimension.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SchemaItem.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.pojo;
+package com.tencent.supersonic.headless.api.pojo;
 
 import com.google.common.base.Objects;
 import com.tencent.supersonic.common.pojo.RecordInfo;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java

@@ -0,0 +1,14 @@
+package com.tencent.supersonic.headless.api.pojo;
+
+
+import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp;
+import lombok.Data;
+
+@Data
+public class SingleItemQueryResult {
+
+    private Item item;
+
+    private QueryResultWithSchemaResp result;
+
+}

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.PageBaseReq;
-import com.tencent.supersonic.headless.common.server.enums.AppStatus;
+import com.tencent.supersonic.headless.api.enums.AppStatus;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.RecordInfo;
-import com.tencent.supersonic.headless.common.server.pojo.AppConfig;
+import com.tencent.supersonic.headless.api.pojo.AppConfig;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.enums.DataType;
+import com.tencent.supersonic.headless.api.enums.DataType;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import java.util.ArrayList;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
-import com.tencent.supersonic.headless.common.server.pojo.DimValueMap;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 
 import java.util.ArrayList;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
-import com.tencent.supersonic.headless.common.server.enums.QueryType;
+import com.tencent.supersonic.headless.api.enums.QueryType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import java.util.List;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import lombok.Data;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DataFormat;
-import com.tencent.supersonic.headless.common.server.pojo.RelateDimension;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.RelateDimension;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java

@@ -1,12 +1,13 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.ColumnOrder;
-import java.util.List;
-import java.util.Map;
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
-public class MetricReq {
+public class MetricQueryReq {
 
     private List<String> metrics;
     private List<String> dimensions;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
-import com.tencent.supersonic.headless.common.server.enums.MetricType;
-import com.tencent.supersonic.headless.common.server.pojo.Measure;
-import com.tencent.supersonic.headless.common.server.pojo.MetricTypeParams;
+import com.tencent.supersonic.headless.api.enums.MetricType;
+import com.tencent.supersonic.headless.api.pojo.Measure;
+import com.tencent.supersonic.headless.api.pojo.MetricTypeParams;
 import lombok.Data;
 import java.util.List;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.pojo.Dim;
-import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension;
-import com.tencent.supersonic.headless.common.server.pojo.ModelDetail;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.ModelDetail;
+import com.tencent.supersonic.headless.api.pojo.Dim;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.PageBaseReq;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
-import com.tencent.supersonic.headless.common.core.pojo.MetricTable;
+import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.tencent.supersonic.common.pojo.DateConf;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.alibaba.fastjson.JSONObject;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryS2SQLReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.request;
+package com.tencent.supersonic.headless.api.request;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.Aggregator;
@@ -12,8 +12,8 @@ import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
 import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper;
-import com.tencent.supersonic.headless.common.core.pojo.Cache;
-import com.tencent.supersonic.headless.common.core.pojo.Param;
+import com.tencent.supersonic.headless.api.pojo.Cache;
+import com.tencent.supersonic.headless.api.pojo.Param;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.JSQLParserException;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 
 import javax.validation.constraints.NotBlank;

headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.request;
+package com.tencent.supersonic.headless.api.request;
 
 import java.util.Date;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;
-import com.tencent.supersonic.headless.common.server.enums.AppStatus;
-import com.tencent.supersonic.headless.common.server.pojo.AppConfig;
+import com.tencent.supersonic.headless.api.enums.AppStatus;
+import com.tencent.supersonic.headless.api.pojo.AppConfig;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.RecordInfo;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
-import com.tencent.supersonic.headless.common.server.pojo.DimValueMap;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DimValueMap;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
-import com.tencent.supersonic.headless.common.server.pojo.Entity;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.Entity;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.common.core.response;
+package com.tencent.supersonic.headless.api.response;
 
-import com.tencent.supersonic.headless.common.core.pojo.SingleItemQueryResult;
+import com.tencent.supersonic.headless.api.pojo.SingleItemQueryResult;
 import lombok.Builder;
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java

@@ -1,14 +1,14 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.tencent.supersonic.common.pojo.DataFormat;
-import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension;
-import com.tencent.supersonic.headless.common.server.pojo.Measure;
-import com.tencent.supersonic.headless.common.server.pojo.MetricTypeParams;
-import com.tencent.supersonic.headless.common.server.pojo.RelateDimension;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.Measure;
+import com.tencent.supersonic.headless.api.pojo.MetricTypeParams;
+import com.tencent.supersonic.headless.api.pojo.RelateDimension;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
 import org.apache.commons.collections.CollectionUtils;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 import lombok.ToString;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.common.server.pojo.Dim;
-import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension;
-import com.tencent.supersonic.headless.common.server.pojo.Identify;
-import com.tencent.supersonic.headless.common.server.pojo.ModelDetail;
-import com.tencent.supersonic.headless.common.server.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.Dim;
+import com.tencent.supersonic.headless.api.pojo.DrillDownDimension;
+import com.tencent.supersonic.headless.api.pojo.ModelDetail;
+import com.tencent.supersonic.headless.api.pojo.SchemaItem;
+import com.tencent.supersonic.headless.api.pojo.Identify;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.Data;
 

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 import com.tencent.supersonic.common.pojo.ModelRela;
-import com.tencent.supersonic.headless.common.server.pojo.Identify;
+import com.tencent.supersonic.headless.api.pojo.Identify;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/QueryResultWithSchemaResp.java

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.common.server.response;
+package com.tencent.supersonic.headless.api.response;
 
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.QueryAuthorization;
 import com.tencent.supersonic.common.pojo.QueryColumn;
-import com.tencent.supersonic.headless.common.server.enums.SemanticType;
-import com.tencent.supersonic.headless.common.server.pojo.QueryResult;
+import com.tencent.supersonic.headless.api.enums.SemanticType;
+import com.tencent.supersonic.headless.api.pojo.QueryResult;
 import lombok.Data;
 import lombok.ToString;
 import java.util.List;

headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SqlParserResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.common.core.response;
+package com.tencent.supersonic.headless.api.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/SingleItemQueryResult.java

@@ -1,15 +0,0 @@
-package com.tencent.supersonic.headless.common.core.pojo;
-
-
-import com.tencent.supersonic.headless.common.server.pojo.Item;
-import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp;
-import lombok.Data;
-
-@Data
-public class SingleItemQueryResult {
-
-    private Item item;
-
-    private QueryResultWithSchemaResp result;
-
-}

headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetaQueryApiReq.java

@@ -1,17 +0,0 @@
-package com.tencent.supersonic.headless.common.core.request;
-
-import com.tencent.supersonic.common.pojo.enums.ApiItemType;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-@Data
-public class MetaQueryApiReq {
-
-    @NotEmpty(message = "ids不可为空")
-    private List<Long> ids;
-
-    private ApiItemType type = ApiItemType.METRIC;
-
-}

headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DimensionType.java

@@ -1,9 +0,0 @@
-package com.tencent.supersonic.headless.common.server.enums;
-
-
-public enum DimensionType {
-
-    categorical,
-    time
-
-}

headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/IdentifyType.java

@@ -1,8 +0,0 @@
-package com.tencent.supersonic.headless.common.server.enums;
-
-public enum IdentifyType {
-
-    primary,
-    foreign,
-
-}

headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/MetricType.java

@@ -1,9 +0,0 @@
-package com.tencent.supersonic.headless.common.server.enums;
-
-
-public enum MetricType {
-
-    ATOMIC,
-    DERIVED
-
-}