Java: fix stubs

Jami Cogswell · Jami Cogswell · commit c69745a6f88d · 2023-03-31T18:02:09.000-04:00
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/io/PrintWriter.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/io/PrintWriter.java
@@ -7,8 +7,16 @@
 import java.io.Writer;
 import java.util.Locale;
 
-public class PrintWriter
+public class PrintWriter extends Writer
 {
     protected PrintWriter() {}
     public void write(String p0){} // manual summary
+
+    // including the below to prevent extraction errors
+    public PrintWriter append(char c) { return null; }
+    public PrintWriter append(CharSequence csq, int start, int end) { return null; }
+    public PrintWriter append(CharSequence csq) { return null; }
+    public void close() {}
+    public void flush() {}
+
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/AbstractStringBuilder.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/AbstractStringBuilder.java
@@ -7,6 +7,17 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence
 {
     public char charAt(int p0){ return '0'; } // manual summary
     public int length(){ return 0; } // manual neutral
-    public void setCharAt(int p0, char p1){} // manual neutral
-    public void setLength(int p0){} // manual neutral
+    public void setCharAt(int p0, char p1){} // manual neutral, Note: not currently counted by query due to exclusions in `TargetApiSpecific`
+    public void setLength(int p0){} // manual neutral, Note: not currently counted by query due to exclusions in `TargetApiSpecific`
+
+
+    public AbstractStringBuilder append(CharSequence p0){ return null; }
+    public AbstractStringBuilder append(Object p0){ return null; }
+    public AbstractStringBuilder append(String p0){ return null; }
+    public AbstractStringBuilder append(boolean p0){ return null; }
+    public AbstractStringBuilder append(char p0){ return null; }
+    public AbstractStringBuilder append(int p0){ return null; }
+    public AbstractStringBuilder append(long p0){ return null; }
+    public AbstractStringBuilder delete(int p0, int p1){ return null; }
+    public abstract String toString();
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/CharSequence.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/CharSequence.java
@@ -8,4 +8,6 @@ public interface CharSequence
 {
     String toString(); // manual summary
     int length(); // manual neutral
+
+    char charAt(int index);
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/Enum.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/Enum.java
@@ -7,7 +7,7 @@
 abstract public class Enum<E extends Enum<E>> implements Comparable<E>, Serializable
 {
     protected Enum() {}
-    protected Enum(String p0, int p1){} // manual neutral
+    protected Enum(String p0, int p1){} // manual neutral, Note: this will not be counted in query results since `protected` not `public`
     public String toString(){ return null; } // manual neutral
     public final String name(){ return null; } // manual neutral
     public final boolean equals(Object p0){ return false; } // manual neutral
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/String.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/String.java
@@ -7,7 +7,7 @@
 import java.util.Comparator;
 import java.util.Locale;
 
-public class String implements Comparable<String>, Serializable
+public class String implements CharSequence, Comparable<String>, Serializable
 {
     public String concat(String p0){ return null; } // manual summary
     public String replace(CharSequence p0, CharSequence p1){ return null; } // manual summary
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/StringBuffer.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/StringBuffer.java
@@ -4,10 +4,15 @@
 
 import java.io.Serializable;
 
-public class StringBuffer implements Serializable
+public class StringBuffer extends AbstractStringBuilder implements Serializable
 {
     public String toString(){ return null; } // manual summary
     public StringBuffer append(Object p0){ return null; } // manual summary
     public StringBuffer append(String p0){ return null; } // manual summary
     public StringBuffer append(char p0){ return null; } // manual summary
+
+    public StringBuffer append(CharSequence s, int start, int end) { return null; }
+
+    public void setCharAt(int p0, char p1){}
+    public void setLength(int p0){}
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/StringBuilder.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/StringBuilder.java
@@ -4,7 +4,7 @@
 
 import java.io.Serializable;
 
-public class StringBuilder implements Serializable
+public class StringBuilder extends AbstractStringBuilder implements Serializable
 {
     public String toString(){ return null; } // manual summary
     public StringBuilder append(CharSequence p0){ return null; } // manual summary
@@ -17,4 +17,9 @@ public class StringBuilder implements Serializable
     public StringBuilder delete(int p0, int p1){ return null; } // manual summary
     public StringBuilder(String p0){} // manual summary
     public StringBuilder(int p0){} // manual summary
+
+    public StringBuilder append(CharSequence s, int start, int end) { return null; }
+
+    public void setCharAt(int p0, char p1){}
+    public void setLength(int p0){}
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/invoke/MethodHandles.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/lang/invoke/MethodHandles.java
@@ -0,0 +1,21 @@
+// Generated automatically from java.lang.invoke.MethodHandles for testing purposes
+
+package java.lang.invoke;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandleInfo;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class MethodHandles
+{
+    protected MethodHandles() {}
+    public static Lookup lookup(){ return null; } // manual neutral
+
+    public static final
+    class Lookup {}
+}
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Collection.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Collection.java
@@ -16,4 +16,8 @@ public interface Collection<E> extends java.lang.Iterable<E>
     default java.util.stream.Stream<E> stream(){ return null; } // manual summary
     int size(); // manual neutral
     java.util.Iterator<E> iterator(); // manual summary
+
+    boolean	addAll(Collection<? extends E> c);
+    Object[] toArray();
+    <T> T[] toArray(T[] a);
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/HashMap.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/HashMap.java
@@ -12,13 +12,14 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-public class HashMap<K, V> implements Cloneable, Serializable
+public class HashMap<K, V> extends java.util.AbstractMap<K, V> implements Cloneable, Serializable
 {
+    public HashMap(){}
     public HashMap(int p0){} // manual neutral
     public HashMap(java.util.Map<? extends K, ? extends V> p0){} // manual summary
     public V get(Object p0){ return null; } // manual summary
     public V put(K p0, V p1){ return null; } // manual summary
     public boolean containsKey(Object p0){ return false; } // manual neutral
     public int size(){ return 0; } // manual neutral
-    // public java.util.Set<Map.Entry<K, V>> entrySet(){ return null; } // manual summary -- REMOVE UNTIL FIX MAP.ENTRYSET
+    public Set<Map.Entry<K, V>> entrySet(){ return null; } // manual summary
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/HashSet.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/HashSet.java
@@ -9,9 +9,25 @@
 import java.util.Set;
 import java.util.Spliterator;
 
-public class HashSet<E> implements Cloneable, Serializable
+public class HashSet<E> implements Cloneable, Serializable, java.util.Set<E>
 {
     public HashSet(int p0){} // manual neutral
     public HashSet(java.util.Collection<? extends E> p0){} // manual summary
     public boolean add(E p0){ return false; } // manual summary
+
+    public void clear() {}
+    public Iterator<E> iterator() { return null; }
+    public int size() { return 0; }
+    public boolean isEmpty() { return false; }
+    public boolean remove(Object o) { return false; }
+    public boolean removeAll(Collection<?> c) { return false; }
+    public boolean contains(Object o) { return false; }
+    public Object[] toArray() { return null; }
+    public <T> T[] toArray(T[] a) { return null; }
+    public boolean containsAll(Collection<?> c) { return false; }
+    public boolean addAll(Collection<? extends E> c) { return false; }
+    public boolean retainAll(Collection<?> c) { return false; }
+    public boolean equals(Object o) { return false; }
+    public int hashCode() { return 0; }
+
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Hashtable.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Hashtable.java
@@ -12,8 +12,14 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-public class Hashtable<K, V> implements Cloneable, Serializable
+public class Hashtable<K, V> extends Dictionary<K, V> implements Cloneable, Serializable
 {
     public V get(Object p0){ return null; } // manual summary
     public V put(K p0, V p1){ return null; } // manual summary
+
+    public synchronized V remove(Object key) { return null; }
+    public synchronized Enumeration<V> elements() { return null; }
+    public synchronized boolean isEmpty() { return false; }
+    public synchronized int size() { return 0; }
+    public synchronized Enumeration<K> keys() { return null; }
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/LinkedHashMap.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/LinkedHashMap.java
@@ -9,7 +9,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 
-public class LinkedHashMap<K, V>
+public class LinkedHashMap<K, V> extends java.util.HashMap<K, V>
 {
     public V get(Object p0){ return null; } // manual summary
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/LinkedList.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/LinkedList.java
@@ -11,7 +11,23 @@
 import java.util.ListIterator;
 import java.util.Spliterator;
 
-public class LinkedList<E> implements Cloneable, Serializable
+public class LinkedList<E> extends AbstractSequentialList<E> implements Cloneable, Serializable
 {
     public boolean add(E p0){ return false; } // manual summary
+
+    public ListIterator<E> listIterator(int index) { return null; }
+    public void clear() {}
+    public Iterator<E> iterator() { return null; }
+    public int size() { return 0; }
+    public boolean isEmpty() { return false; }
+    public boolean remove(Object o) { return false; }
+    public boolean removeAll(Collection<?> c) { return false; }
+    public boolean contains(Object o) { return false; }
+    public Object[] toArray() { return null; }
+    public <T> T[] toArray(T[] a) { return null; }
+    public boolean containsAll(Collection<?> c) { return false; }
+    public boolean addAll(Collection<? extends E> c) { return false; }
+    public boolean retainAll(Collection<?> c) { return false; }
+    public boolean equals(Object o) { return false; }
+    public int hashCode() { return 0; }
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/List.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/List.java
@@ -30,4 +30,9 @@ default void sort(java.util.Comparator<? super E> p0){} // manual neutral
     java.util.Iterator<E> iterator(); // manual summary
     void add(int p0, E p1); // manual summary
     void clear(); // manual neutral
+
+    static <E> List<E> of() { return null; } // manual neutral
+    static <E> List<E> of(E e1) { return null; } // manual summary
+    static <E> List<E> of(E e1, E e2) { return null; } // manual summary
+    static <E> List<E> of(E e1, E e2, E e3) { return null; } // manual summary
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Map.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Map.java
@@ -22,7 +22,16 @@ default void forEach(java.util.function.BiConsumer<? super K, ? super V> p0){} /
     int size(); // manual neutral
     java.util.Collection<V> values(); // manual summary
     java.util.Set<K> keySet(); // manual summary
-    // java.util.Set<Map.Entry<K, V>> entrySet(); // manual summary - REMOVE UNTIL FIX MAP.ENTRY
+    java.util.Set<Map.Entry<K, V>> entrySet(); // manual summary
     void clear(); // manual neutral
     void putAll(java.util.Map<? extends K, ? extends V> p0); // manual summary
+
+    static <K, V> Map.Entry<K, V> entry(K k, V v) { return null; }  // manual summary
+    static <K, V> Map<K, V> of(K k1, V v1) { return null; }  // manual summary
+    static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2) { return null; }  // manual summary
+
+    interface Entry<K, V> {
+        K getKey(); // manual summary
+        V getValue(); // manual summary
+    }
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Optional.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Optional.java
@@ -21,4 +21,8 @@ protected Optional() {}
     public static <T> java.util.Optional<T> of(T p0){ return null; } // manual summary
     public static <T> java.util.Optional<T> ofNullable(T p0){ return null; } // manual summary
     public void ifPresent(java.util.function.Consumer<? super T> p0){} // manual summary
+
+    public boolean isEmpty() { return false; } // manual neutral
+    public T orElseThrow() { return null; } // manual summary
+
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Properties.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Properties.java
@@ -16,4 +16,6 @@ public class Properties extends Hashtable<Object, Object>
 {
     public Object setProperty(String p0, String p1){ return null; } // manual summary
     public String getProperty(String p0){ return null; } // manual summary
+
+    public synchronized Object put(Object key, Object value) { return null; } // manual summary
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Set.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Set.java
@@ -17,4 +17,7 @@ public interface Set<E> extends java.util.Collection<E>
     int size(); // manual neutral
     java.util.Iterator<E> iterator(); // manual summary
     void clear(); // manual neutral
+
+    static <E> Set<E> of(E e1) { return null; } // manual summary
+    static <E> Set<E> of(E e1, E e2) { return null; } // manual summary
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Vector.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/Vector.java
@@ -16,9 +16,11 @@
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 
-public class Vector<E> implements Cloneable, RandomAccess, Serializable
+public class Vector<E> extends java.util.AbstractList<E> implements Cloneable, RandomAccess, Serializable, java.util.List<E>
 {
     public boolean add(E p0){ return false; } // manual summary
     public int size(){ return 0; } // manual neutral
     public void addElement(E p0){} // manual summary
+
+    public E get(int p0){ return null; }
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/concurrent/ConcurrentHashMap.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/concurrent/ConcurrentHashMap.java
@@ -25,8 +25,10 @@
 import java.util.function.ToLongBiFunction;
 import java.util.function.ToLongFunction;
 
-public class ConcurrentHashMap<K, V> implements Serializable
+public class ConcurrentHashMap<K, V> extends AbstractMap<K,V> implements Serializable
 {
     public V get(Object p0){ return null; } // manual summary
     public V put(K p0, V p1){ return null; } // manual summary
+
+    public Set<Map.Entry<K,V>> entrySet() { return null; }
 }
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/concurrent/TimeUnit.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/concurrent/TimeUnit.java
@@ -0,0 +1,17 @@
+// Generated automatically from java.util.concurrent.TimeUnit for testing purposes
+
+package java.util.concurrent;
+
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Objects;
+
+public enum TimeUnit
+{
+    DAYS, HOURS, MICROSECONDS, MILLISECONDS, MINUTES, NANOSECONDS, SECONDS;
+    private TimeUnit() {}
+    public long toMillis(long p0){ return 0; } // manual neutral
+
+    @Override
+    public int compareTo(TimeUnit o) { return 1; }
+}
diff --git a/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/stream/Stream.java b/java/ql/test/query-tests/Metrics/GeneratedVsManualCoverage/TopJdkApisTest/openjdkStubs/java/util/stream/Stream.java
@@ -43,4 +43,6 @@ public interface Stream<T> extends BaseStream<T, Stream<T>>
     static <T> java.util.stream.Stream<T> of(T p0){ return null; } // manual summary
     static <T> java.util.stream.Stream<T> of(T... p0){ return null; } // manual summary
     void forEach(java.util.function.Consumer<? super T> p0); // manual summary
+
+    default java.util.List<T> toList() { return null; } // manual summary
 }

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,6 @@ public interface CharSequence`
`8`	`8`	`{`
`9`	`9`	`String toString(); // manual summary`
`10`	`10`	`int length(); // manual neutral`
	`11`	`+`
	`12`	`+ char charAt(int index);`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`abstract public class Enum<E extends Enum<E>> implements Comparable<E>, Serializable`
`8`	`8`	`{`
`9`	`9`	`protected Enum() {}`
`10`		`- protected Enum(String p0, int p1){} // manual neutral`
	`10`	+ protected Enum(String p0, int p1){} // manual neutral, Note: this will not be counted in query results since `protected` not `public`
`11`	`11`	`public String toString(){ return null; } // manual neutral`
`12`	`12`	`public final String name(){ return null; } // manual neutral`
`13`	`13`	`public final boolean equals(Object p0){ return false; } // manual neutral`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`import java.util.Comparator;`
`8`	`8`	`import java.util.Locale;`
`9`	`9`
`10`		`-public class String implements Comparable<String>, Serializable`
	`10`	`+public class String implements CharSequence, Comparable<String>, Serializable`
`11`	`11`	`{`
`12`	`12`	`public String concat(String p0){ return null; } // manual summary`
`13`	`13`	`public String replace(CharSequence p0, CharSequence p1){ return null; } // manual summary`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,8 @@ public interface Collection<E> extends java.lang.Iterable<E>`
`16`	`16`	`default java.util.stream.Stream<E> stream(){ return null; } // manual summary`
`17`	`17`	`int size(); // manual neutral`
`18`	`18`	`java.util.Iterator<E> iterator(); // manual summary`
	`19`	`+`
	`20`	`+ boolean addAll(Collection<? extends E> c);`
	`21`	`+ Object[] toArray();`
	`22`	`+ <T> T[] toArray(T[] a);`
`19`	`23`	`}`