Deprecated Spring IoC and using Guice instead (opensearch-project#1177)

* Deprecated Spring IoC and using Guice instead Signed-off-by: Peng Huo <[email protected]> * fix checkstyle issue Signed-off-by: Peng Huo <[email protected]> * Pass injector to action Signed-off-by: Peng Huo <[email protected]> * update Signed-off-by: Peng Huo <[email protected]> Signed-off-by: Peng Huo <[email protected]> (cherry picked from commit 0a02009)
penghuo · Mar 8, 2023 · b35a16e · b35a16e
1 parent 652e771
commit b35a16e
Show file tree

Hide file tree

Showing 35 changed files with 256 additions and 528 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,6 @@
 buildscript {
     ext {
         opensearch_version = System.getProperty("opensearch.version", "2.7.0-SNAPSHOT")
-        spring_version = "5.3.22"
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         version_tokens = opensearch_version.tokenize('-')

diff --git a/core/build.gradle b/core/build.gradle
@@ -35,8 +35,6 @@ repositories {
 
 dependencies {
     api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
-    api group: 'org.springframework', name: 'spring-context', version: "${spring_version}"
-    api group: 'org.springframework', name: 'spring-beans', version: "${spring_version}"
     api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
     api group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
     api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
@@ -47,7 +45,6 @@ dependencies {
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
-    testImplementation group: 'org.springframework', name: 'spring-test', version: "${spring_version}"
     testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
     testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
 }

diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTest.java
@@ -65,7 +65,6 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.Argument;
 import org.opensearch.sql.ast.expression.DataType;
@@ -89,15 +88,7 @@
 import org.opensearch.sql.planner.logical.LogicalProject;
 import org.opensearch.sql.planner.logical.LogicalRelation;
 import org.opensearch.sql.planner.physical.datasource.DataSourceTable;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTest.class})
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+
 class AnalyzerTest extends AnalyzerTestBase {
 
   @Test

diff --git a/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java b/core/src/test/java/org/opensearch/sql/analysis/AnalyzerTestBase.java
@@ -13,6 +13,7 @@
 import com.google.common.collect.ImmutableSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.sql.analysis.symbol.Namespace;
@@ -39,8 +40,6 @@
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 
 
 public class AnalyzerTestBase {
@@ -49,14 +48,12 @@ protected Map<String, ExprType> typeMapping() {
     return TestConfig.typeMapping;
   }
 
-  @Bean
   protected StorageEngine storageEngine() {
     return (dataSourceSchemaName, tableName) -> table;
   }
 
-  @Bean
   protected Table table() {
-    return new Table() {
+    return Optional.ofNullable(table).orElseGet(() -> new Table() {
       @Override
       public boolean exists() {
         return true;
@@ -76,31 +73,13 @@ public Map<String, ExprType> getFieldTypes() {
       public PhysicalPlan implement(LogicalPlan plan) {
         throw new UnsupportedOperationException();
       }
-    };
-  }
-
-  @Bean
-  protected Table dataSourceTable() {
-    return new Table() {
-      @Override
-      public Map<String, ExprType> getFieldTypes() {
-        return typeMapping();
-      }
-
-      @Override
-      public PhysicalPlan implement(LogicalPlan plan) {
-        throw new UnsupportedOperationException();
-      }
-    };
+    });
   }
 
-  @Bean
   protected DataSourceService dataSourceService() {
-    return new DefaultDataSourceService();
+    return Optional.ofNullable(dataSourceService).orElseGet(DefaultDataSourceService::new);
   }
 
-
-  @Bean
   protected SymbolTable symbolTable() {
     SymbolTable symbolTable = new SymbolTable();
     typeMapping().entrySet()
@@ -110,7 +89,6 @@ protected SymbolTable symbolTable() {
     return symbolTable;
   }
 
-  @Bean
   protected Environment<Expression, ExprType> typeEnv() {
     return var -> {
       if (var instanceof ReferenceExpression) {
@@ -123,25 +101,16 @@ protected Environment<Expression, ExprType> typeEnv() {
     };
   }
 
-  @Autowired
-  protected AnalysisContext analysisContext;
-
-  @Autowired
-  protected ExpressionAnalyzer expressionAnalyzer;
+  protected AnalysisContext analysisContext = analysisContext(typeEnvironment(symbolTable()));
 
-  @Autowired
-  protected Analyzer analyzer;
+  protected ExpressionAnalyzer expressionAnalyzer = expressionAnalyzer();
 
-  @Autowired
-  protected Table table;
+  protected Table table = table();
 
-  @Autowired
-  protected DataSourceService dataSourceService;
+  protected DataSourceService dataSourceService = dataSourceService();
 
-  @Autowired
-  protected Environment<Expression, ExprType> typeEnv;
+  protected Analyzer analyzer = analyzer(expressionAnalyzer(), dataSourceService, table);
 
-  @Bean
   protected Analyzer analyzer(ExpressionAnalyzer expressionAnalyzer,
                       DataSourceService dataSourceService,
                       Table table) {
@@ -167,17 +136,14 @@ public FunctionName getFunctionName() {
     return new Analyzer(expressionAnalyzer, dataSourceService, functionRepository);
   }
 
-  @Bean
   protected TypeEnvironment typeEnvironment(SymbolTable symbolTable) {
     return new TypeEnvironment(null, symbolTable);
   }
 
-  @Bean
   protected AnalysisContext analysisContext(TypeEnvironment typeEnvironment) {
     return new AnalysisContext(typeEnvironment);
   }
 
-  @Bean
   protected ExpressionAnalyzer expressionAnalyzer() {
     return new ExpressionAnalyzer(BuiltinFunctionRepository.getInstance());
   }

diff --git a/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
@@ -31,7 +31,6 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.analysis.symbol.Namespace;
 import org.opensearch.sql.analysis.symbol.Symbol;
 import org.opensearch.sql.ast.dsl.AstDSL;
@@ -48,15 +47,8 @@
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.FunctionExpression;
-import org.opensearch.sql.expression.function.FunctionPropertiesTestConfig;
 import org.opensearch.sql.expression.window.aggregation.AggregateWindowFunction;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {FunctionPropertiesTestConfig.class, AnalyzerTestBase.class})
 class ExpressionAnalyzerTest extends AnalyzerTestBase {
 
   @Test

diff --git a/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java b/core/src/test/java/org/opensearch/sql/analysis/ExpressionReferenceOptimizerTest.java
@@ -14,20 +14,13 @@
 
 import com.google.common.collect.ImmutableList;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.Expression;
 import org.opensearch.sql.expression.function.BuiltinFunctionRepository;
 import org.opensearch.sql.expression.window.WindowDefinition;
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTest.class})
 class ExpressionReferenceOptimizerTest extends AnalyzerTestBase {
 
   @Test

diff --git a/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/NamedExpressionAnalyzerTest.java
@@ -11,19 +11,12 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.expression.HighlightFunction;
 import org.opensearch.sql.ast.expression.Literal;
 import org.opensearch.sql.expression.NamedExpression;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTestBase.class})
 class NamedExpressionAnalyzerTest extends AnalyzerTestBase {
   @Test
   void visit_named_select_item() {

diff --git a/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/QualifierAnalyzerTest.java
@@ -13,18 +13,11 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.analysis.symbol.Namespace;
 import org.opensearch.sql.analysis.symbol.Symbol;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
 import org.opensearch.sql.data.type.ExprType;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {AnalyzerTestBase.class})
 class QualifierAnalyzerTest extends AnalyzerTestBase {
 
   private QualifierAnalyzer qualifierAnalyzer;

diff --git a/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java b/core/src/test/java/org/opensearch/sql/analysis/SelectAnalyzeTest.java
@@ -17,20 +17,13 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.AllFields;
 import org.opensearch.sql.data.type.ExprCoreType;
 import org.opensearch.sql.data.type.ExprType;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {SelectAnalyzeTest.class})
 public class SelectAnalyzeTest extends AnalyzerTestBase {
 
   @Override

diff --git a/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/SelectExpressionAnalyzerTest.java
@@ -24,14 +24,8 @@
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.expression.DSL;
 import org.opensearch.sql.expression.NamedExpression;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
 @ExtendWith(MockitoExtension.class)
-@ContextConfiguration(classes = {SelectExpressionAnalyzerTest.class})
 public class SelectExpressionAnalyzerTest extends AnalyzerTestBase {
 
   @Mock

diff --git a/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java b/core/src/test/java/org/opensearch/sql/analysis/WindowExpressionAnalyzerTest.java
@@ -21,10 +21,7 @@
 import java.util.Collections;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.Alias;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
@@ -34,14 +31,7 @@
 import org.opensearch.sql.planner.logical.LogicalPlanDSL;
 import org.opensearch.sql.planner.logical.LogicalRelation;
 import org.opensearch.sql.planner.logical.LogicalSort;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@Configuration
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {SelectExpressionAnalyzerTest.class})
-@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 class WindowExpressionAnalyzerTest extends AnalyzerTestBase {
 
   private LogicalPlan child;

diff --git a/core/src/test/java/org/opensearch/sql/config/TestConfig.java b/core/src/test/java/org/opensearch/sql/config/TestConfig.java
@@ -22,13 +22,10 @@
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.StorageEngine;
 import org.opensearch.sql.storage.Table;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * Configuration will be used for UT.
  */
-@Configuration
 public class TestConfig {
   public static final String INT_TYPE_NULL_VALUE_FIELD = "int_null_value";
   public static final String INT_TYPE_MISSING_VALUE_FIELD = "int_missing_value";
@@ -61,7 +58,6 @@ public class TestConfig {
       .put("field_value2", ExprCoreType.STRING)
       .build();
 
-  @Bean
   protected StorageEngine storageEngine() {
     return new StorageEngine() {
       @Override
@@ -91,8 +87,6 @@ public PhysicalPlan implement(LogicalPlan plan) {
     };
   }
 
-
-  @Bean
   protected SymbolTable symbolTable() {
     SymbolTable symbolTable = new SymbolTable();
     typeMapping.entrySet()
@@ -102,7 +96,6 @@ protected SymbolTable symbolTable() {
     return symbolTable;
   }
 
-  @Bean
   protected Environment<Expression, ExprType> typeEnv() {
     return var -> {
       if (var instanceof ReferenceExpression) {

diff --git a/core/src/test/java/org/opensearch/sql/executor/QueryServiceTest.java b/core/src/test/java/org/opensearch/sql/executor/QueryServiceTest.java
@@ -32,11 +32,9 @@
 import org.opensearch.sql.planner.logical.LogicalPlan;
 import org.opensearch.sql.planner.physical.PhysicalPlan;
 import org.opensearch.sql.storage.split.Split;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 @ExtendWith(MockitoExtension.class)
 class QueryServiceTest {
-  private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 
   private QueryService queryService;