(improvement)(common) Optimized the structure of the common package. (#1164)

common/src/main/java/com/tencent/supersonic/common/calcite/S2MysqlSqlDialect.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.calcite;
+package com.tencent.supersonic.common.calcite;
 
 import org.apache.calcite.sql.dialect.MysqlSqlDialect;
 

common/src/main/java/com/tencent/supersonic/common/calcite/SqlParseUtils.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.calcite;
+package com.tencent.supersonic.common.calcite;
 
 
 import java.util.HashMap;

common/src/main/java/com/tencent/supersonic/common/calcite/SqlParserInfo.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.calcite;
+package com.tencent.supersonic.common.calcite;
 
 import java.io.Serializable;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Arrays;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.DatePeriodEnum;
 import com.tencent.supersonic.common.util.DateUtils;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import lombok.Data;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/ExpressionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAcquireVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Set;
 import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.DatePeriodEnum;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldExpression.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.Data;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldlValueReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.JsonUtil;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledExpression.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.Data;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledFilterReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.ArrayList;
 import java.util.List;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledNameReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FilterRemoveVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import net.sf.jsqlparser.expression.Expression;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionAliasReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.HashMap;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionNameReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.StringUtil;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.HashSet;
 import java.util.Set;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByFunctionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.statement.select.GroupByElement;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/JsqlConstants.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByAcquireVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.Constants;
 import java.util.Set;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByExpression.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import lombok.Data;
 

common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import net.sf.jsqlparser.expression.Expression;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Map.Entry;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.Map;
 import java.util.Objects;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelper.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
-import com.tencent.supersonic.common.util.jsqlparser.DateVisitor.DateBoundInfo;
+
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +14,7 @@ import net.sf.jsqlparser.statement.select.PlainSelect;
 @Slf4j
 public class SqlDateSelectHelper {
 
-    public static DateBoundInfo getDateBoundInfo(String sql) {
+    public static DateVisitor.DateBoundInfo getDateBoundInfo(String sql) {
         List<PlainSelect> plainSelectList = SqlSelectHelper.getPlainSelect(sql);
         if (plainSelectList.size() != 1) {
             return null;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEditEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 public enum SqlEditEnum {
     NUMBER_FILTER,

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import java.util.HashSet;
 import java.util.List;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.util.StringUtil;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import com.tencent.supersonic.common.util.StringUtil;
 import java.util.ArrayList;

common/src/main/java/com/tencent/supersonic/common/jsqlparser/TableNameReplaceVisitor.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.jsqlparser;
+package com.tencent.supersonic.common.jsqlparser;
 
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.select.FromItemVisitorAdapter;

common/src/main/java/com/tencent/supersonic/common/util/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java

@@ -1,21 +0,0 @@
-package com.tencent.supersonic.common.util.embedding;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore;
-import java.lang.reflect.Type;
-
-public class GsonInMemoryEmbeddingStoreJsonCodec implements InMemoryEmbeddingStoreJsonCodec {
-
-    @Override
-    public InMemoryEmbeddingStore<EmbeddingQuery> fromJson(String json) {
-        Type type = new TypeToken<InMemoryEmbeddingStore<EmbeddingQuery>>() {
-        }.getType();
-        return new Gson().fromJson(json, type);
-    }
-
-    @Override
-    public String toJson(InMemoryEmbeddingStore<?> store) {
-        return new Gson().toJson(store);
-    }
-}

common/src/main/java/dev/langchain4j/store/embedding/ComponentFactory.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.common.util;
+package dev.langchain4j.store.embedding;
 
-import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore;
-import java.util.Objects;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 
+import java.util.Objects;
+
 public class ComponentFactory {
 
     private static S2EmbeddingStore s2EmbeddingStore;

common/src/main/java/dev/langchain4j/store/embedding/EmbeddingCollection.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 
 import lombok.Data;

common/src/main/java/dev/langchain4j/store/embedding/EmbeddingQuery.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 
 import com.alibaba.fastjson.JSONObject;

common/src/main/java/dev/langchain4j/store/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java

@@ -0,0 +1,21 @@
+package dev.langchain4j.store.embedding;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+
+public class GsonInMemoryEmbeddingStoreJsonCodec implements InMemoryEmbeddingStoreJsonCodec {
+
+    @Override
+    public InMemoryS2EmbeddingStore.InMemoryEmbeddingStore<EmbeddingQuery> fromJson(String json) {
+        Type type = new TypeToken<InMemoryS2EmbeddingStore.InMemoryEmbeddingStore<EmbeddingQuery>>() {
+        }.getType();
+        return new Gson().fromJson(json, type);
+    }
+
+    @Override
+    public String toJson(InMemoryS2EmbeddingStore.InMemoryEmbeddingStore<?> store) {
+        return new Gson().toJson(store);
+    }
+}

common/src/main/java/dev/langchain4j/store/embedding/InMemoryEmbeddingStoreJsonCodec.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
-import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore;
+import dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore;
 
 public interface InMemoryEmbeddingStoreJsonCodec {
 

common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java

@@ -1,15 +1,11 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.util.ContextUtils;
 import dev.langchain4j.data.embedding.Embedding;
 import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.store.embedding.CosineSimilarity;
-import dev.langchain4j.store.embedding.EmbeddingMatch;
-import dev.langchain4j.store.embedding.EmbeddingStore;
-import dev.langchain4j.store.embedding.RelevanceScore;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;

common/src/main/java/dev/langchain4j/store/embedding/PythonServiceS2EmbeddingStore.java

@@ -1,14 +1,10 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.config.EmbeddingConfig;
 import com.tencent.supersonic.common.util.ContextUtils;
-import java.net.URI;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -20,6 +16,11 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 /***
  * Implementation of calling the Python service S2EmbeddingStore.
  */

common/src/main/java/dev/langchain4j/store/embedding/Retrieval.java

@@ -1,11 +1,12 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import com.google.common.base.Objects;
 import com.tencent.supersonic.common.pojo.Constants;
-import java.util.Map;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Map;
+
 @Data
 public class Retrieval {
 

common/src/main/java/dev/langchain4j/store/embedding/RetrieveQuery.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import lombok.Builder;
 import lombok.Data;

common/src/main/java/dev/langchain4j/store/embedding/RetrieveQueryResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 
 import lombok.Data;

common/src/main/java/dev/langchain4j/store/embedding/S2EmbeddingStore.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.common.util.embedding;
+package dev.langchain4j.store.embedding;
 
 import java.util.List;