Update Annotations

microsphere-projects · Apr 9, 2024 · 0fb3427 · 0fb3427
1 parent 1c9d786
commit 0fb3427
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...-i18n-spring/src/main/java/io/microsphere/i18n/spring/DelegatingServiceMessageSource.java b/...-i18n-spring/src/main/java/io/microsphere/i18n/spring/DelegatingServiceMessageSource.java
@@ -11,8 +11,8 @@
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.lang.NonNull;
 
-import javax.annotation.Nonnull;
 import java.nio.charset.Charset;
 import java.util.LinkedList;
 import java.util.List;
@@ -59,7 +59,7 @@ public void afterPropertiesSet() throws Exception {
         init();
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public String getMessage(String code, Locale locale, Object... args) {
         return this.delegate.getMessage(code, locale, args);
@@ -70,20 +70,20 @@ public String getMessage(String code, Object... args) {
         return this.delegate.getMessage(code, args);
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public Locale getLocale() {
         Locale locale = LocaleContextHolder.getLocale();
         return locale == null ? this.delegate.getLocale() : locale;
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public Locale getDefaultLocale() {
         return this.delegate.getDefaultLocale();
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public List<Locale> getSupportedLocales() {
         return this.delegate.getSupportedLocales();

diff --git a/...-spring/src/main/java/io/microsphere/i18n/spring/PropertySourcesServiceMessageSource.java b/...-spring/src/main/java/io/microsphere/i18n/spring/PropertySourcesServiceMessageSource.java
@@ -7,8 +7,8 @@
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySources;
+import org.springframework.lang.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;

diff --git a/...c/main/java/io/microsphere/i18n/spring/beans/factory/ServiceMessageSourceFactoryBean.java b/...c/main/java/io/microsphere/i18n/spring/beans/factory/ServiceMessageSourceFactoryBean.java
@@ -20,10 +20,10 @@
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
+import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.Nonnull;
 import java.lang.reflect.Constructor;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -105,7 +105,7 @@ public void destroy() {
         this.delegate.destroy();
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public String getMessage(String code, Locale locale, Object... args) {
         return this.delegate.getMessage(code, locale, args);
@@ -116,7 +116,7 @@ public String getMessage(String code, Object... args) {
         return this.delegate.getMessage(code, args);
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public Locale getLocale() {
         Locale locale = LocaleContextHolder.getLocale();
@@ -126,13 +126,13 @@ public Locale getLocale() {
         return locale;
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public Locale getDefaultLocale() {
         return this.delegate.getDefaultLocale();
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public List<Locale> getSupportedLocales() {
         return this.delegate.getSupportedLocales();