Skip to content

Commit 64548d1

Browse files
committed
Update dependencies, hide SmoothieMapBuilder.create()
1 parent d22c3a1 commit 64548d1

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ plugins {
1818
id 'checkstyle'
1919
id 'de.thetaphi.forbiddenapis' version '2.6'
2020
id 'net.ltgt.errorprone' version '0.8.1'
21+
id 'io.freefair.javadoc-links' version '4.1.2'
2122
}
2223

2324
// The plugin inhibits annotation processing, disabling for now: see
@@ -30,8 +31,8 @@ repositories {
3031
}
3132

3233
dependencies {
33-
api 'org.checkerframework:checker-qual:2.7.0'
34-
compileOnly 'org.jetbrains:annotations:16.0.3'
34+
api 'org.checkerframework:checker-qual:2.11.1'
35+
compileOnly 'org.jetbrains:annotations:17.0.0'
3536
compileOnly 'com.google.errorprone:error_prone_annotations:2.3.3'
3637
def autoValueVersion = '1.6.5'
3738
compileOnly "com.google.auto.value:auto-value-annotations:$autoValueVersion"
@@ -203,7 +204,7 @@ task sourcesJar(type: Jar, dependsOn: classes) {
203204

204205
javadoc {
205206
options {
206-
links 'http://docs.oracle.com/javase/8/docs/api/'
207+
links 'https://docs.oracle.com/en/java/javase/11/docs/api/'
207208
tags = [
208209
'apiNote:a:API Note:',
209210
'implSpec:a:Implementation Requirements:',
@@ -232,7 +233,7 @@ publishing {
232233
artifact sourcesJar
233234
artifact javadocJar
234235
pom {
235-
name = 'SmoothieMap 2'
236+
name = 'SmoothieMap'
236237
inceptionYear = '2018'
237238
description = 'Map implementation with low footprint and no latency spikes'
238239
url = 'https://github.com/TimeAndSpaceIO/SmoothieMap'

settings.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
/*
2-
* This file was generated by the Gradle 'init' task.
3-
*/
4-
5-
rootProject.name = 'SmoothieMap2'
1+
rootProject.name = 'SmoothieMap'

src/main/java/io/timeandspace/collect/map/ObjObjMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ default long mappingCount() {
541541
* true. {@code hashCode()} on the entry set is the same as on the map itself, see {@link
542542
* #hashCode()}.
543543
*
544-
* <p>The entry set does not support the {@code Set#add} and {@link Set#addAll} operations.
544+
* <p>The entry set does not support the {@link Set#add} and {@link Set#addAll} operations.
545545
*
546546
* <p>The set is created the first time this method is called, and returned in response to all
547547
* subsequent calls. No synchronization is performed, so there is a slight chance that multiple

src/main/javaTemplates/io/timeandspace/smoothie/SmoothieMap.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@
182182
* SmoothieMap.newBuilder().build()}. See possible configurations in the documentation for {@link
183183
* SmoothieMapBuilder}.
184184
*
185-
* <p>Unlike {@link HashMap}, but like {@link java.util.concurrent.ConcurrentHashMap} or Guava's
186-
* ImmutableMaps, SmoothieMap does <i>not</i> support null key and values. An attempt to put null
187-
* key or value, or query null key or value (e. g. via {@link #get(Object) get(null)}), leads to
188-
* a {@link NullPointerException}.
185+
* <p>Unlike {@link HashMap}, but like {@link java.util.concurrent.ConcurrentHashMap}, {@code
186+
* Map.of()} immutable Maps, and Guava's ImmutableMaps, SmoothieMap does <i>not</i> support null key
187+
* and values. An attempt to put null key or value, or query null key or value (e. g. via {@link
188+
* #get(Object) get(null)}), leads to a {@link NullPointerException}.
189189
*
190190
* <p>{@code SmoothieMap} supports pluggable keys' and values' equivalences which could be
191191
* configured in the builder, via {@link SmoothieMapBuilder#keyEquivalence(Equivalence)} and
@@ -241,6 +241,7 @@ public class SmoothieMap<K, V> implements ObjObjMap<K, V> {
241241
* @param <V> the type of values in SmoothieMap(s) to be created
242242
* @return a new {@link SmoothieMapBuilder}
243243
*/
244+
@Contract(value = " -> new", pure = true)
244245
public static <K, V> SmoothieMapBuilder<K, V> newBuilder() {
245246
return SmoothieMapBuilder.create();
246247
}

src/main/javaTemplates/io/timeandspace/smoothie/SmoothieMapBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public final class SmoothieMapBuilder<K, V> {
5454
private static final double MAX_EXPECTED_SIZE_ERROR_FRACTION = 0.05;
5555

5656
@Contract(value = " -> new", pure = true)
57-
public static <K, V> SmoothieMapBuilder<K, V> create() {
57+
static <K, V> SmoothieMapBuilder<K, V> create() {
5858
return new SmoothieMapBuilder<>();
5959
}
6060

0 commit comments

Comments
 (0)