Browse Source

warnings: unchecked
move: keepass to drafts

Mariusz Sieroń 6 năm trước cách đây
mục cha
commit
c33b8e39ef

+ 5 - 0
assira.drafts/pom.xml

@@ -16,6 +16,11 @@
             <groupId>net.ranides</groupId>
             <artifactId>assira</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.linguafranca.pwdb</groupId>
+            <artifactId>KeePassJava2</artifactId>
+            <version>2.1.1</version>
+        </dependency>
         <dependency>
             <groupId>com.sun</groupId>
             <artifactId>tools</artifactId>

+ 11 - 3
assira/src/main/java/net/ranides/assira/credentials/PWDBStore.java

@@ -1,19 +1,27 @@
 package net.ranides.assira.credentials;
 
-import net.ranides.assira.collection.maps.*;
+import net.ranides.assira.collection.maps.AGenericMap;
+import net.ranides.assira.collection.maps.GenericEntry;
+import net.ranides.assira.collection.maps.GenericKey;
+import net.ranides.assira.collection.maps.GenericMap;
 import net.ranides.assira.collection.query.CQuery;
 import net.ranides.assira.collection.query.CQueryBuilder;
 import net.ranides.assira.collection.sets.SetUtils;
 import net.ranides.assira.generic.TypeToken;
 import net.ranides.assira.reflection.IClass;
-import org.linguafranca.pwdb.*;
+import org.linguafranca.pwdb.Database;
+import org.linguafranca.pwdb.Entry;
+import org.linguafranca.pwdb.Group;
+import org.linguafranca.pwdb.Icon;
 import org.linguafranca.pwdb.kdbx.KdbxCreds;
 import org.linguafranca.pwdb.kdbx.jaxb.JaxbDatabase;
 
 import java.io.InputStream;
 import java.net.URI;
-import java.util.*;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

+ 1 - 7
assira/pom.xml

@@ -44,8 +44,6 @@
                                 <include>net/ranides/assira/collection/maps/MultiMap*</include>
                                 <include>net/ranides/assira/collection/query/**</include>
 
-                                <include>net/ranides/assira/credentials/PWDBStore*</include>
-
                                 <include>net/ranides/assira/events/EventObserver*</include>
 
                                 <!-- <include>net/ranides/assira/io/PathUtils*</include>-->
@@ -125,11 +123,7 @@
             <artifactId>commons-net</artifactId>
             <version>3.4</version>
             <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.linguafranca.pwdb</groupId>
-            <artifactId>KeePassJava2</artifactId>
-            <version>2.1.1</version>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>

+ 1 - 0
assira/src/main/java/net/ranides/assira/collection/maps/IntMapUtils.java

@@ -73,6 +73,7 @@ public final class IntMapUtils {
         protected final Function<? super TV, ? extends RV> function;
         protected final BiFunction<Integer, ? super RV, ? extends RV> inserter;
 
+        @SuppressWarnings("unchecked")
         public MapAdapter(IntMap<TV> content, Function<? super TV, ? extends RV> function, BiFunction<Integer, ? super RV, ? extends RV> inserter) {
             this.content = content;
             this.function = function;

+ 2 - 1
assira/src/main/java/net/ranides/assira/collection/maps/MapUtils.java

@@ -94,7 +94,8 @@ public final class MapUtils {
         protected final Map<K, TV> content;
         protected final Function<? super TV, ? extends RV> function;
         protected final BiFunction<? super K, ? super RV, ? extends RV> inserter;
-        
+
+        @SuppressWarnings("unchecked")
         public MapAdapter(Map<K, TV> content, Function<? super TV, ? extends RV> function, BiFunction<? super K, ? super RV, ? extends RV> setter) {
             this.content = content;
             this.function = function;

+ 1 - 0
assira/src/main/java/net/ranides/assira/generic/EnumFactory.java

@@ -12,6 +12,7 @@ public final class EnumFactory<E extends Enum<E>> {
 
     private static final String INCOMPATIBLE_JDK = "Incompatible JDK Version: can not create instances of enum at runtime";
 
+    @SuppressWarnings("unchecked")
     private static final CacheMap<Class, EnumFactory> CACHE = CacheMap.getInstance(EnumFactory::new);
 
     private final VarFunction<E> constructor;

+ 0 - 3
assira/src/main/java/net/ranides/assira/generic/OptionalReference.java

@@ -1,7 +1,5 @@
 package net.ranides.assira.generic;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.io.Serializable;
 import java.util.*;
 import java.util.function.Consumer;
@@ -81,7 +79,6 @@ public class OptionalReference<V> extends AbstractCollection<V> implements Set<V
         return value != null ? String.format("OptionalReference[%s]", value) : "OptionalReference.empty";
     }
 
-    @NotNull
     @Override
     public Iterator<V> iterator() {
         return new SingleIterator();

+ 2 - 2
assira/src/main/java/net/ranides/assira/reflection/IClass.java

@@ -22,8 +22,8 @@ import net.ranides.assira.reflection.util.ClassUtils;
 @SuppressWarnings("PMD.TooManyDifferentMethods")
 public interface IClass<T> extends IElement, Comparable<IClass<?>> {
 
-    @SuppressWarnings({"raw"})
-    IClass<?> NULL = new AClass(IContext.DEFAULT){};
+    @SuppressWarnings({"raw", "unchecked"})
+    IClass NULL = new AClass(IContext.DEFAULT){};
 
     IClass<?> OBJECT = typeinfo(Object.class);