some annotation clean up

moving more deps in to depMgmt
MorphiaOrg · May 21, 2023 · a010d8a · a010d8a
1 parent 99e88ae
commit a010d8a
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 31 deletions.
diff --git a/audits/pom.xml b/audits/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>org.kohsuke</groupId>
             <artifactId>github-api</artifactId>
-            <version>1.313</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -27,32 +26,22 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <version>9.5</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.15.3</version>
         </dependency>
         <dependency>
             <groupId>org.asciidoctor</groupId>
             <artifactId>asciidoctorj</artifactId>
-            <version>2.5.7</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.forge.roaster</groupId>
             <artifactId>roaster-api</artifactId>
-            <version>${roaster.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.forge.roaster</groupId>
             <artifactId>roaster-jdt</artifactId>
-            <version>${roaster.version}</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

diff --git a/build-plugins/pom.xml b/build-plugins/pom.xml
@@ -78,12 +78,10 @@
         <dependency>
             <groupId>org.jboss.forge.roaster</groupId>
             <artifactId>roaster-api</artifactId>
-            <version>${roaster.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.forge.roaster</groupId>
             <artifactId>roaster-jdt</artifactId>
-            <version>${roaster.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -159,28 +159,18 @@
         <dependency>
             <groupId>io.github.classgraph</groupId>
             <artifactId>classgraph</artifactId>
-            <version>4.8.153</version>
         </dependency>
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>1.14.4</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
-            <version>4.7.3</version>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -229,8 +219,6 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.15.3</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/core/src/main/java/dev/morphia/DatastoreImpl.java b/core/src/main/java/dev/morphia/DatastoreImpl.java
@@ -72,7 +72,6 @@
 import org.bson.codecs.DecoderContext;
 import org.bson.codecs.configuration.CodecProvider;
 import org.bson.codecs.configuration.CodecRegistry;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -782,7 +781,7 @@ private <T> Codec<T> getRefreshCodec(T entity) {
         throw new IllegalStateException(Sofia.noRefreshCodec(entity.getClass().getName()));
     }
 
-    @NotNull
+    @NonNull
     private <T> Map<Class<?>, List<T>> groupByType(List<T> entities, Predicate<EntityModel> special) {
         Map<Class<?>, List<T>> grouped = new LinkedHashMap<>();
         for (T entity : entities) {

diff --git a/core/src/main/java/dev/morphia/aggregation/codecs/AggregationCodecProvider.java b/core/src/main/java/dev/morphia/aggregation/codecs/AggregationCodecProvider.java
@@ -3,6 +3,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.mongodb.lang.Nullable;
+
 import dev.morphia.Datastore;
 import dev.morphia.aggregation.codecs.stages.AddFieldsCodec;
 import dev.morphia.aggregation.codecs.stages.AutoBucketCodec;
@@ -46,7 +48,6 @@
 import org.bson.codecs.Codec;
 import org.bson.codecs.configuration.CodecProvider;
 import org.bson.codecs.configuration.CodecRegistry;
-import org.jetbrains.annotations.Nullable;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class AggregationCodecProvider implements CodecProvider {
@@ -62,6 +63,7 @@ public AggregationCodecProvider(Datastore datastore) {
     }
 
     @Override
+    @Nullable
     public <T> Codec<T> get(Class<T> clazz, CodecRegistry registry) {
         Codec<T> codec = getCodecs().get(clazz);
         if (codec == null) {

diff --git a/core/src/main/java/dev/morphia/mapping/conventions/MethodDiscovery.java b/core/src/main/java/dev/morphia/mapping/conventions/MethodDiscovery.java
@@ -22,8 +22,6 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import org.jetbrains.annotations.NotNull;
-
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toList;
 
@@ -110,7 +108,7 @@ public int hashCode() {
         }
     }
 
-    @NotNull
+    @NonNull
     private String stripPrefix(Method m) {
         return m.getName().startsWith("get")
                 || m.getName().startsWith("set")

diff --git a/pom.xml b/pom.xml
@@ -206,6 +206,53 @@
                 <version>${jackson.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.kohsuke</groupId>
+                <artifactId>github-api</artifactId>
+                <version>1.313</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-tree</artifactId>
+                <version>9.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>1.15.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctorj</artifactId>
+                <version>2.5.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.forge.roaster</groupId>
+                <artifactId>roaster-api</artifactId>
+                <version>2.28.0.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.forge.roaster</groupId>
+                <artifactId>roaster-jdt</artifactId>
+                <version>2.28.0.Final</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-annotations</artifactId>
+                <version>4.7.3</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>1.14.4</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.classgraph</groupId>
+                <artifactId>classgraph</artifactId>
+                <version>4.8.153</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>