Explorar o código

处理警告.

聂秋秋 %!s(int64=6) %!d(string=hai) anos
pai
achega
72e608c447

+ 1 - 0
mybatis-plus-boot-starter/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.java

@@ -113,6 +113,7 @@ public class MybatisPlusAutoConfiguration implements InitializingBean {
         }
         }
     }
     }
 
 
+    @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
     @Bean
     @Bean
     @ConditionalOnMissingBean
     @ConditionalOnMissingBean
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {

+ 28 - 28
mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/pom/GeneratePomTest.java

@@ -31,34 +31,34 @@ class GeneratePomTest {
     
     
     @Test
     @Test
     void test() throws IOException {
     void test() throws IOException {
-        InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");
-        Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
-        Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
-        Jerry dependencies = doc.$("dependencies dependency");
-        Map<String, Dependency> dependenciesMap = new HashMap<>();
-        dependencies.forEach($this -> {
-            String artifactId = $this.$("artifactId").text();
-            dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
-        });
-        Dependency mp = dependenciesMap.get("mybatis-plus");
-        Assertions.assertEquals("compile", mp.getScope());
-        Assertions.assertFalse(mp.isOptional());
-        Dependency autoconfigure = dependenciesMap.get("spring-boot-autoconfigure");
-        Assertions.assertEquals("compile", autoconfigure.getScope());
-        Assertions.assertFalse(autoconfigure.isOptional());
-        Dependency jdbc = dependenciesMap.get("spring-boot-starter-jdbc");
-        Assertions.assertEquals("compile", jdbc.getScope());
-        Assertions.assertFalse(jdbc.isOptional());
-        Dependency configurationProcessor = dependenciesMap.get("spring-boot-configuration-processor");
-        Assertions.assertEquals("compile", configurationProcessor.getScope());
-        Assertions.assertTrue(configurationProcessor.isOptional());
-        Dependency autoconfigureProcessor = dependenciesMap.get("spring-boot-autoconfigure-processor");
-        Assertions.assertEquals("compile", autoconfigureProcessor.getScope());
-        Assertions.assertTrue(autoconfigureProcessor.isOptional());
-        Dependency bom = dependenciesMap.get("spring-boot-dependencies");
-        Assertions.assertEquals("import", bom.getScope());
-        Assertions.assertFalse(bom.isOptional());
-        
+        try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml")) {
+            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
+            Jerry dependencies = doc.$("dependencies dependency");
+            Map<String, Dependency> dependenciesMap = new HashMap<>();
+            dependencies.forEach($this -> {
+                String artifactId = $this.$("artifactId").text();
+                dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
+            });
+            Dependency mp = dependenciesMap.get("mybatis-plus");
+            Assertions.assertEquals("compile", mp.getScope());
+            Assertions.assertFalse(mp.isOptional());
+            Dependency autoconfigure = dependenciesMap.get("spring-boot-autoconfigure");
+            Assertions.assertEquals("compile", autoconfigure.getScope());
+            Assertions.assertFalse(autoconfigure.isOptional());
+            Dependency jdbc = dependenciesMap.get("spring-boot-starter-jdbc");
+            Assertions.assertEquals("compile", jdbc.getScope());
+            Assertions.assertFalse(jdbc.isOptional());
+            Dependency configurationProcessor = dependenciesMap.get("spring-boot-configuration-processor");
+            Assertions.assertEquals("compile", configurationProcessor.getScope());
+            Assertions.assertTrue(configurationProcessor.isOptional());
+            Dependency autoconfigureProcessor = dependenciesMap.get("spring-boot-autoconfigure-processor");
+            Assertions.assertEquals("compile", autoconfigureProcessor.getScope());
+            Assertions.assertTrue(autoconfigureProcessor.isOptional());
+            Dependency bom = dependenciesMap.get("spring-boot-dependencies");
+            Assertions.assertEquals("import", bom.getScope());
+            Assertions.assertFalse(bom.isOptional());
+        }
     }
     }
     
     
 }
 }

+ 22 - 21
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/pom/GeneratePomTest.java

@@ -31,27 +31,28 @@ class GeneratePomTest {
     
     
     @Test
     @Test
     void test() throws IOException {
     void test() throws IOException {
-        InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");
-        Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
-        Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
-        Jerry dependencies = doc.$("dependencies dependency");
-        Map<String, Dependency> dependenciesMap = new HashMap<>();
-        dependencies.forEach($this -> {
-            String artifactId = $this.$("artifactId").text();
-            dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
-        });
-        Dependency annotation = dependenciesMap.get("mybatis-plus-annotation");
-        Assertions.assertEquals("compile", annotation.getScope());
-        Assertions.assertFalse(annotation.isOptional());
-        Dependency mybatis = dependenciesMap.get("mybatis");
-        Assertions.assertEquals("compile", mybatis.getScope());
-        Assertions.assertFalse(mybatis.isOptional());
-        Dependency jsqlParser = dependenciesMap.get("jsqlparser");
-        Assertions.assertEquals("compile", jsqlParser.getScope());
-        Assertions.assertFalse(jsqlParser.isOptional());
-        Dependency cglib = dependenciesMap.get("cglib");
-        Assertions.assertEquals("compile", cglib.getScope());
-        Assertions.assertTrue(cglib.isOptional());
+        try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");) {
+            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
+            Jerry dependencies = doc.$("dependencies dependency");
+            Map<String, Dependency> dependenciesMap = new HashMap<>();
+            dependencies.forEach($this -> {
+                String artifactId = $this.$("artifactId").text();
+                dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
+            });
+            Dependency annotation = dependenciesMap.get("mybatis-plus-annotation");
+            Assertions.assertEquals("compile", annotation.getScope());
+            Assertions.assertFalse(annotation.isOptional());
+            Dependency mybatis = dependenciesMap.get("mybatis");
+            Assertions.assertEquals("compile", mybatis.getScope());
+            Assertions.assertFalse(mybatis.isOptional());
+            Dependency jsqlParser = dependenciesMap.get("jsqlparser");
+            Assertions.assertEquals("compile", jsqlParser.getScope());
+            Assertions.assertFalse(jsqlParser.isOptional());
+            Dependency cglib = dependenciesMap.get("cglib");
+            Assertions.assertEquals("compile", cglib.getScope());
+            Assertions.assertTrue(cglib.isOptional());
+        }
     }
     }
     
     
 }
 }

+ 31 - 30
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/pom/GeneratePomTest.java

@@ -31,36 +31,37 @@ class GeneratePomTest {
     
     
     @Test
     @Test
     void test() throws IOException {
     void test() throws IOException {
-        InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");
-        Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
-        Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
-        Jerry dependencies = doc.$("dependencies dependency");
-        Map<String, Dependency> dependenciesMap = new HashMap<>();
-        dependencies.forEach($this -> {
-            String artifactId = $this.$("artifactId").text();
-            dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
-        });
-        Dependency core = dependenciesMap.get("mybatis-plus-core");
-        Assertions.assertEquals("compile", core.getScope());
-        Assertions.assertFalse(core.isOptional());
-        Dependency mybatisSpring = dependenciesMap.get("mybatis-spring");
-        Assertions.assertEquals("compile", mybatisSpring.getScope());
-        Assertions.assertFalse(mybatisSpring.isOptional());
-        Dependency kotlinStdlib = dependenciesMap.get("kotlin-stdlib-jdk8");
-        Assertions.assertEquals("compile", kotlinStdlib.getScope());
-        Assertions.assertTrue(kotlinStdlib.isOptional());
-        Dependency kotlinReflect = dependenciesMap.get("kotlin-reflect");
-        Assertions.assertEquals("compile", kotlinReflect.getScope());
-        Assertions.assertTrue(kotlinReflect.isOptional());
-        Dependency support = dependenciesMap.get("spring-context-support");
-        Assertions.assertEquals("compile", support.getScope());
-        Assertions.assertTrue(support.isOptional());
-        Dependency jdbc = dependenciesMap.get("spring-jdbc");
-        Assertions.assertEquals("compile", jdbc.getScope());
-        Assertions.assertTrue(jdbc.isOptional());
-        Dependency slf4jApi = dependenciesMap.get("slf4j-api");
-        Assertions.assertEquals("compile", slf4jApi.getScope());
-        Assertions.assertTrue(slf4jApi.isOptional());
+        try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");) {
+            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
+            Jerry dependencies = doc.$("dependencies dependency");
+            Map<String, Dependency> dependenciesMap = new HashMap<>();
+            dependencies.forEach($this -> {
+                String artifactId = $this.$("artifactId").text();
+                dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
+            });
+            Dependency core = dependenciesMap.get("mybatis-plus-core");
+            Assertions.assertEquals("compile", core.getScope());
+            Assertions.assertFalse(core.isOptional());
+            Dependency mybatisSpring = dependenciesMap.get("mybatis-spring");
+            Assertions.assertEquals("compile", mybatisSpring.getScope());
+            Assertions.assertFalse(mybatisSpring.isOptional());
+            Dependency kotlinStdlib = dependenciesMap.get("kotlin-stdlib-jdk8");
+            Assertions.assertEquals("compile", kotlinStdlib.getScope());
+            Assertions.assertTrue(kotlinStdlib.isOptional());
+            Dependency kotlinReflect = dependenciesMap.get("kotlin-reflect");
+            Assertions.assertEquals("compile", kotlinReflect.getScope());
+            Assertions.assertTrue(kotlinReflect.isOptional());
+            Dependency support = dependenciesMap.get("spring-context-support");
+            Assertions.assertEquals("compile", support.getScope());
+            Assertions.assertTrue(support.isOptional());
+            Dependency jdbc = dependenciesMap.get("spring-jdbc");
+            Assertions.assertEquals("compile", jdbc.getScope());
+            Assertions.assertTrue(jdbc.isOptional());
+            Dependency slf4jApi = dependenciesMap.get("slf4j-api");
+            Assertions.assertEquals("compile", slf4jApi.getScope());
+            Assertions.assertTrue(slf4jApi.isOptional());
+        }
     }
     }
     
     
 }
 }

+ 22 - 21
mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/pom/GeneratePomTest.java

@@ -31,27 +31,28 @@ class GeneratePomTest {
     
     
     @Test
     @Test
     void test() throws IOException {
     void test() throws IOException {
-        InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");
-        Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
-        Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
-        Jerry dependencies = doc.$("dependencies dependency");
-        Map<String, Dependency> dependenciesMap = new HashMap<>();
-        dependencies.forEach($this -> {
-            String artifactId = $this.$("artifactId").text();
-            dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
-        });
-        Dependency extension = dependenciesMap.get("mybatis-plus-extension");
-        Assertions.assertEquals("compile", extension.getScope());
-        Assertions.assertFalse(extension.isOptional());
-        Dependency velocity = dependenciesMap.get("velocity-engine-core");
-        Assertions.assertEquals("compile", velocity.getScope());
-        Assertions.assertTrue(velocity.isOptional());
-        Dependency freemarker = dependenciesMap.get("freemarker");
-        Assertions.assertEquals("compile", freemarker.getScope());
-        Assertions.assertTrue(freemarker.isOptional());
-        Dependency beetl = dependenciesMap.get("beetl");
-        Assertions.assertEquals("compile", beetl.getScope());
-        Assertions.assertTrue(beetl.isOptional());
+        try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml")) {
+            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
+            Jerry dependencies = doc.$("dependencies dependency");
+            Map<String, Dependency> dependenciesMap = new HashMap<>();
+            dependencies.forEach($this -> {
+                String artifactId = $this.$("artifactId").text();
+                dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
+            });
+            Dependency extension = dependenciesMap.get("mybatis-plus-extension");
+            Assertions.assertEquals("compile", extension.getScope());
+            Assertions.assertFalse(extension.isOptional());
+            Dependency velocity = dependenciesMap.get("velocity-engine-core");
+            Assertions.assertEquals("compile", velocity.getScope());
+            Assertions.assertTrue(velocity.isOptional());
+            Dependency freemarker = dependenciesMap.get("freemarker");
+            Assertions.assertEquals("compile", freemarker.getScope());
+            Assertions.assertTrue(freemarker.isOptional());
+            Dependency beetl = dependenciesMap.get("beetl");
+            Assertions.assertEquals("compile", beetl.getScope());
+            Assertions.assertTrue(beetl.isOptional());
+        }
     }
     }
     
     
 }
 }

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/BaseTest.java

@@ -5,7 +5,7 @@ import org.springframework.test.annotation.DirtiesContext;
 @DirtiesContext
 @DirtiesContext
 public class BaseTest {
 public class BaseTest {
 
 
-    protected final String NQQ = "聂秋秋";
+    protected static final String NQQ = "聂秋秋";
 
 
     protected void log(Object object) {
     protected void log(Object object) {
         System.out.println(object);
         System.out.println(object);

+ 16 - 15
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java

@@ -31,21 +31,22 @@ class GeneratePomTest {
     
     
     @Test
     @Test
     void test() throws IOException {
     void test() throws IOException {
-        InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");
-        Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
-        Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
-        Jerry dependencies = doc.$("dependencies dependency");
-        Map<String, Dependency> dependenciesMap = new HashMap<>();
-        dependencies.forEach($this -> {
-            String artifactId = $this.$("artifactId").text();
-            dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
-        });
-        Dependency extension = dependenciesMap.get("mybatis-plus-extension");
-        Assertions.assertEquals("compile", extension.getScope());
-        Assertions.assertFalse(extension.isOptional());
-        Dependency generator = dependenciesMap.get("mybatis-plus-generator");
-        Assertions.assertEquals("compile", generator.getScope());
-        Assertions.assertTrue(generator.isOptional());
+        try (InputStream inputStream = new FileInputStream("build/publications/mavenJava/pom-default.xml");) {
+            Jerry.JerryParser jerryParser = new Jerry.JerryParser(new LagartoDOMBuilder().enableXmlMode());
+            Jerry doc = jerryParser.parse(FileUtil.readUTFString(inputStream));
+            Jerry dependencies = doc.$("dependencies dependency");
+            Map<String, Dependency> dependenciesMap = new HashMap<>();
+            dependencies.forEach($this -> {
+                String artifactId = $this.$("artifactId").text();
+                dependenciesMap.put(artifactId, new Dependency(artifactId, $this.$("scope").text(), Boolean.parseBoolean($this.$("optional").text())));
+            });
+            Dependency extension = dependenciesMap.get("mybatis-plus-extension");
+            Assertions.assertEquals("compile", extension.getScope());
+            Assertions.assertFalse(extension.isOptional());
+            Dependency generator = dependenciesMap.get("mybatis-plus-generator");
+            Assertions.assertEquals("compile", generator.getScope());
+            Assertions.assertTrue(generator.isOptional());
+        }
     }
     }
     
     
 }
 }