From a52035608dd819a5fe53d6c08fbba44a03a2ee82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CChineseTony=E2=80=9C?= <13206573871@163.com>
Date: Wed, 28 Apr 2021 16:33:29 +0800
Subject: [PATCH] fix

---
 samples/micronaut-sureness/README.md             |  7 +++++--
 samples/micronaut-sureness/pom.xml               | 16 +++++++++++++++-
 .../sureness/MicronautSurenessFilterExample.java |  2 --
 .../sureness/SurenessConfiguration.java          |  5 +++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/samples/micronaut-sureness/README.md b/samples/micronaut-sureness/README.md
index da5eb5e..41dbedd 100644
--- a/samples/micronaut-sureness/README.md
+++ b/samples/micronaut-sureness/README.md
@@ -195,12 +195,15 @@ public class MicronautSurenessFilterExample  implements HttpServerFilter {
 }
 ```
 SurenessSecurityManager configuration
+
 ```java
-@Singleton
+import io.micronaut.context.annotation.Factory;
+
+@Factory
 public class SurenessConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(SurenessConfiguration.class);
 
-    @Singleton
+    @Factory
     public SurenessSecurityManager init() {
         SurenessAccountProvider accountProvider = new DocumentAccountProvider();
         List<Processor> processorList = new LinkedList<>();
diff --git a/samples/micronaut-sureness/pom.xml b/samples/micronaut-sureness/pom.xml
index d38d40c..a095432 100644
--- a/samples/micronaut-sureness/pom.xml
+++ b/samples/micronaut-sureness/pom.xml
@@ -11,6 +11,9 @@
     <packaging>${packaging}</packaging>
 
     <properties>
+        <release.version>8</release.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <packaging>jar</packaging>
         <jdk.version>1.8</jdk.version>
         <micronaut.version>2.4.3</micronaut.version>
@@ -24,7 +27,7 @@
         <dependencies>
             <dependency>
                 <groupId>io.micronaut</groupId>
-                <artifactId>micronaut-parent</artifactId>
+                <artifactId>micronaut-bom</artifactId>
                 <version>${micronaut.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -85,6 +88,7 @@
     </dependencies>
 
     <build>
+
         <plugins>
             <plugin>
                 <groupId>io.micronaut.build</groupId>
@@ -97,6 +101,16 @@
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
                     <annotationProcessorPaths combine.children="append">
+                        <path>
+                            <groupId>io.micronaut</groupId>
+                            <artifactId>micronaut-inject-java</artifactId>
+                            <version>${micronaut.version}</version>
+                        </path>
+                        <path>
+                            <groupId>io.micronaut</groupId>
+                            <artifactId>micronaut-validation</artifactId>
+                            <version>${micronaut.version}</version>
+                        </path>
                     </annotationProcessorPaths>
                     <compilerArgs>
                         <arg>-Amicronaut.processing.group=com.usthe.sureness</arg>
diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/MicronautSurenessFilterExample.java b/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/MicronautSurenessFilterExample.java
index 15e8dbd..5b109bd 100644
--- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/MicronautSurenessFilterExample.java
+++ b/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/MicronautSurenessFilterExample.java
@@ -64,8 +64,6 @@ public class MicronautSurenessFilterExample implements HttpServerFilter {
             logger.error("other exception happen: ", e);
             statusCode = HttpStatus.FORBIDDEN.getCode();
             errorMsg = e.getMessage();
-        }finally {
-            SurenessContextHolder.unbindSubject();
         }
         if (statusCode != null && errorMsg != null) {
             String finalErrorMsg = errorMsg;
diff --git a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/SurenessConfiguration.java b/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/SurenessConfiguration.java
index 0a20b66..ffdfb11 100644
--- a/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/SurenessConfiguration.java
+++ b/samples/micronaut-sureness/src/main/java/com/usthe/sureness/micronaut/sureness/SurenessConfiguration.java
@@ -17,6 +17,7 @@ import com.usthe.sureness.provider.ducument.DocumentPathTreeProvider;
 import com.usthe.sureness.subject.SubjectCreate;
 import com.usthe.sureness.subject.SubjectFactory;
 import com.usthe.sureness.subject.SurenessSubjectFactory;
+import io.micronaut.context.annotation.Factory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,11 +29,11 @@ import java.util.List;
 /**
  * @author tom
  */
-@Singleton
+@Factory
 public class SurenessConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(SurenessConfiguration.class);
 
-    @Singleton
+    @Factory
     public SurenessSecurityManager init() {
         SurenessAccountProvider accountProvider = new DocumentAccountProvider();
         List<Processor> processorList = new LinkedList<>();
-- 
GitLab