format code

vsch · vsch · commit fe958a94694c · 2019-10-22T15:43:16.000-04:00
diff --git a/flexmark-ext-abbreviation/src/main/java/com/vladsch/flexmark/ext/abbreviation/internal/AbbreviationBlockParser.java b/flexmark-ext-abbreviation/src/main/java/com/vladsch/flexmark/ext/abbreviation/internal/AbbreviationBlockParser.java
@@ -6,8 +6,6 @@
 import com.vladsch.flexmark.parser.block.*;
 import com.vladsch.flexmark.util.ast.Block;
 import com.vladsch.flexmark.util.data.DataHolder;
-import com.vladsch.flexmark.util.data.DataKey;
-import com.vladsch.flexmark.util.data.DataKeyBase;
 import com.vladsch.flexmark.util.sequence.BasedSequence;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/flexmark-ext-abbreviation/src/main/java/com/vladsch/flexmark/ext/abbreviation/internal/AbbreviationNodePostProcessor.java b/flexmark-ext-abbreviation/src/main/java/com/vladsch/flexmark/ext/abbreviation/internal/AbbreviationNodePostProcessor.java
@@ -6,11 +6,9 @@
 import com.vladsch.flexmark.ext.abbreviation.AbbreviationBlock;
 import com.vladsch.flexmark.ext.abbreviation.AbbreviationExtension;
 import com.vladsch.flexmark.ext.autolink.internal.AutolinkNodePostProcessor;
-import com.vladsch.flexmark.parser.PostProcessorFactory;
 import com.vladsch.flexmark.parser.block.NodePostProcessor;
 import com.vladsch.flexmark.parser.block.NodePostProcessorFactory;
 import com.vladsch.flexmark.util.ast.*;
-import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.html.Escaping;
 import com.vladsch.flexmark.util.sequence.BasedSequence;
 import com.vladsch.flexmark.util.sequence.ReplacedTextMapper;
diff --git a/flexmark-ext-admonition/src/main/java/com/vladsch/flexmark/ext/admonition/AdmonitionExtension.java b/flexmark-ext-admonition/src/main/java/com/vladsch/flexmark/ext/admonition/AdmonitionExtension.java
@@ -7,8 +7,6 @@
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.data.DataKey;
-import com.vladsch.flexmark.util.data.DataValueFactory;
-import com.vladsch.flexmark.util.data.DataValueNullableFactory;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/flexmark-ext-gfm-strikethrough/src/main/java/com/vladsch/flexmark/ext/gfm/strikethrough/StrikethroughExtension.java b/flexmark-ext-gfm-strikethrough/src/main/java/com/vladsch/flexmark/ext/gfm/strikethrough/StrikethroughExtension.java
@@ -6,7 +6,6 @@
 import com.vladsch.flexmark.ext.gfm.strikethrough.internal.StrikethroughYouTrackRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import com.vladsch.flexmark.util.data.NullableDataKey;
 import org.jetbrains.annotations.NotNull;
diff --git a/flexmark-ext-gfm-strikethrough/src/main/java/com/vladsch/flexmark/ext/gfm/strikethrough/StrikethroughSubscriptExtension.java b/flexmark-ext-gfm-strikethrough/src/main/java/com/vladsch/flexmark/ext/gfm/strikethrough/StrikethroughSubscriptExtension.java
@@ -6,7 +6,6 @@
 import com.vladsch.flexmark.ext.gfm.strikethrough.internal.StrikethroughYouTrackRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import com.vladsch.flexmark.util.data.NullableDataKey;
 import org.jetbrains.annotations.NotNull;
diff --git a/flexmark-ext-gfm-strikethrough/src/main/java/com/vladsch/flexmark/ext/gfm/strikethrough/SubscriptExtension.java b/flexmark-ext-gfm-strikethrough/src/main/java/com/vladsch/flexmark/ext/gfm/strikethrough/SubscriptExtension.java
@@ -6,7 +6,6 @@
 import com.vladsch.flexmark.ext.gfm.strikethrough.internal.SubscriptDelimiterProcessor;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import com.vladsch.flexmark.util.data.NullableDataKey;
 import org.jetbrains.annotations.NotNull;
diff --git a/flexmark-ext-ins/src/main/java/com/vladsch/flexmark/ext/ins/InsExtension.java b/flexmark-ext-ins/src/main/java/com/vladsch/flexmark/ext/ins/InsExtension.java
@@ -5,7 +5,6 @@
 import com.vladsch.flexmark.ext.ins.internal.InsNodeRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import com.vladsch.flexmark.util.data.NullableDataKey;
 import org.jetbrains.annotations.NotNull;
diff --git a/flexmark-ext-superscript/src/main/java/com/vladsch/flexmark/ext/superscript/SuperscriptExtension.java b/flexmark-ext-superscript/src/main/java/com/vladsch/flexmark/ext/superscript/SuperscriptExtension.java
@@ -5,7 +5,6 @@
 import com.vladsch.flexmark.ext.superscript.internal.SuperscriptNodeRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
-import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import com.vladsch.flexmark.util.data.NullableDataKey;
 import org.jetbrains.annotations.NotNull;
diff --git a/flexmark-ext-toc/src/main/java/com/vladsch/flexmark/ext/toc/TocExtension.java b/flexmark-ext-toc/src/main/java/com/vladsch/flexmark/ext/toc/TocExtension.java
@@ -40,7 +40,7 @@ public class TocExtension implements Parser.ParserExtension, HtmlRenderer.HtmlRe
 
     // format options
     public static final DataKey<SimTocGenerateOnFormat> FORMAT_UPDATE_ON_FORMAT = new DataKey<>("FORMAT_UPDATE_ON_FORMAT", SimTocGenerateOnFormat.UPDATE);
-    public static final DataKey<TocOptions> FORMAT_OPTIONS = new DataKey<>("FORMAT_OPTIONS", new TocOptions(null,false), options -> new TocOptions(options, false));
+    public static final DataKey<TocOptions> FORMAT_OPTIONS = new DataKey<>("FORMAT_OPTIONS", new TocOptions(null, false), options -> new TocOptions(options, false));
 
     private TocExtension() {
     }
diff --git a/flexmark-ext-zzzzzz/src/main/java/com/vladsch/flexmark/ext/zzzzzz/internal/ZzzzzzRepository.java b/flexmark-ext-zzzzzz/src/main/java/com/vladsch/flexmark/ext/zzzzzz/internal/ZzzzzzRepository.java
@@ -10,7 +10,10 @@
 import com.vladsch.flexmark.util.data.DataKey;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @SuppressWarnings("WeakerAccess")
 public class ZzzzzzRepository extends NodeRepository<ZzzzzzBlock> {
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/CustomContextDataSample.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/CustomContextDataSample.java
@@ -14,7 +14,6 @@
 import com.vladsch.flexmark.util.ast.Document;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.data.DataHolder;
-import com.vladsch.flexmark.util.data.DataKey;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import com.vladsch.flexmark.util.data.NullableDataKey;
 import org.jetbrains.annotations.NotNull;
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/FencedCodeCustomRenderingSample.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/FencedCodeCustomRenderingSample.java
@@ -5,7 +5,10 @@
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer.Builder;
 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
-import com.vladsch.flexmark.html.renderer.*;
+import com.vladsch.flexmark.html.renderer.CoreNodeRenderer;
+import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory;
+import com.vladsch.flexmark.html.renderer.NodeRenderer;
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.data.DataHolder;
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/InlineCodeCustomRenderingSample.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/InlineCodeCustomRenderingSample.java
@@ -8,7 +8,6 @@
 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
 import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory;
 import com.vladsch.flexmark.html.renderer.NodeRenderer;
-import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
 import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.Node;
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/ParagraphCustomRenderingSample.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/ParagraphCustomRenderingSample.java
@@ -6,7 +6,6 @@
 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
 import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory;
 import com.vladsch.flexmark.html.renderer.NodeRenderer;
-import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
 import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.Node;
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/SyntheticLinkSample.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/SyntheticLinkSample.java
@@ -7,7 +7,6 @@
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.parser.PostProcessor;
-import com.vladsch.flexmark.parser.PostProcessorFactory;
 import com.vladsch.flexmark.parser.block.DocumentPostProcessor;
 import com.vladsch.flexmark.parser.block.DocumentPostProcessorFactory;
 import com.vladsch.flexmark.parser.block.NodePostProcessor;
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/TitleExtract.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/TitleExtract.java
@@ -7,7 +7,10 @@
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
 import com.vladsch.flexmark.html.HtmlWriter;
-import com.vladsch.flexmark.html.renderer.*;
+import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory;
+import com.vladsch.flexmark.html.renderer.NodeRenderer;
+import com.vladsch.flexmark.html.renderer.NodeRendererContext;
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.parser.ParserEmulationProfile;
 import com.vladsch.flexmark.profile.pegdown.Extensions;
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/TocSubContextSample.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/TocSubContextSample.java
@@ -6,7 +6,10 @@
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer.Builder;
 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
-import com.vladsch.flexmark.html.renderer.*;
+import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory;
+import com.vladsch.flexmark.html.renderer.NodeRenderer;
+import com.vladsch.flexmark.html.renderer.NodeRendererContext;
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.data.DataHolder;
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/TocSubContextSample2.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/TocSubContextSample2.java
@@ -6,7 +6,10 @@
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer.Builder;
 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
-import com.vladsch.flexmark.html.renderer.*;
+import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory;
+import com.vladsch.flexmark.html.renderer.NodeRenderer;
+import com.vladsch.flexmark.html.renderer.NodeRendererContext;
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.Document;
 import com.vladsch.flexmark.util.data.DataHolder;
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/FlexmarkResourceUrlResolver.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/FlexmarkResourceUrlResolver.java
@@ -1,10 +1,10 @@
 package com.vladsch.flexmark.test.util;
 
-import com.vladsch.flexmark.test.util.spec.ResourceLocation;
 import com.vladsch.flexmark.test.util.spec.ResourceResolverManager;
 import com.vladsch.flexmark.test.util.spec.ResourceUrlResolver;
 
-import static com.vladsch.flexmark.test.util.spec.ResourceUrlResolver.*;
+import static com.vladsch.flexmark.test.util.spec.ResourceUrlResolver.isFileProtocol;
+import static com.vladsch.flexmark.test.util.spec.ResourceUrlResolver.removeProtocol;
 
 public class FlexmarkResourceUrlResolver {
     public static void registerUrlResolvers() {
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/ResourceResolverManager.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/ResourceResolverManager.java
@@ -1,6 +1,5 @@
 package com.vladsch.flexmark.test.util.spec;
 
-import com.vladsch.flexmark.test.util.ComboSpecTestCase;
 import com.vladsch.flexmark.test.util.TestUtils;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/ast/NodeIterator.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/ast/NodeIterator.java
@@ -1,7 +1,6 @@
 package com.vladsch.flexmark.util.ast;
 
 import com.vladsch.flexmark.util.collection.iteration.ReversiblePeekingIterator;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.NoSuchElementException;
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/builder/BuilderBase.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/builder/BuilderBase.java
@@ -1,11 +1,17 @@
 package com.vladsch.flexmark.util.builder;
 
 import com.vladsch.flexmark.util.SharedDataKeys;
-import com.vladsch.flexmark.util.data.*;
+import com.vladsch.flexmark.util.data.DataHolder;
+import com.vladsch.flexmark.util.data.DataKey;
+import com.vladsch.flexmark.util.data.MutableDataSet;
+import com.vladsch.flexmark.util.data.NullableDataKey;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
 
 public abstract class BuilderBase<T extends BuilderBase<T>> extends MutableDataSet {
 
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/BoundedMaxAggregator.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/BoundedMaxAggregator.java
@@ -1,6 +1,5 @@
 package com.vladsch.flexmark.util.collection;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.BiFunction;
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/BoundedMinAggregator.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/BoundedMinAggregator.java
@@ -1,6 +1,5 @@
 package com.vladsch.flexmark.util.collection;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.BiFunction;
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/NullCollectionHost.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/NullCollectionHost.java
@@ -1,6 +1,5 @@
 package com.vladsch.flexmark.util.collection;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class NullCollectionHost<K> implements CollectionHost<K> {
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/OrderedMultiMap.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/OrderedMultiMap.java
@@ -34,12 +34,12 @@ public OrderedMultiMap(int capacity, @Nullable CollectionHost<Paired<K, V>> host
         this.myIndexedProxy = null;
         this.myValueSet = new OrderedSet<>(capacity, new CollectionHost<V>() {
             @Override
-            public void adding(int index, @Nullable  V v, @Nullable  Object k) {
+            public void adding(int index, @Nullable V v, @Nullable Object k) {
                 addingValue(index, v, k);
             }
 
             @Override
-            public Object removing(int index, @Nullable  V v) {
+            public Object removing(int index, @Nullable V v) {
                 return removingValue(index, v);
             }
 
@@ -66,12 +66,12 @@ public int getIteratorModificationCount() {
 
         this.myKeySet = new OrderedSet<>(capacity, new CollectionHost<K>() {
             @Override
-            public void adding(int index, @Nullable  K k, @Nullable  Object v) {
+            public void adding(int index, @Nullable K k, @Nullable Object v) {
                 addingKey(index, k, v);
             }
 
             @Override
-            public Object removing(int index, @Nullable  K k) {
+            public Object removing(int index, @Nullable K k) {
                 return removingKey(index, k);
             }
 
@@ -138,7 +138,7 @@ public int getModificationCount() {
     }
 
     @SuppressWarnings("unchecked")
-    void addingKey(int index, @Nullable  K k, @Nullable Object v) {
+    void addingKey(int index, @Nullable K k, @Nullable Object v) {
         assert !myInValueUpdate;
 
         myInValueUpdate = true;
@@ -161,7 +161,7 @@ void addingNullKey(int index) {
         myInValueUpdate = false;
     }
 
-    Object removingKey(int index, @Nullable  K k) {
+    Object removingKey(int index, @Nullable K k) {
         assert !myInValueUpdate;
 
         myInValueUpdate = true;
@@ -174,7 +174,7 @@ Object removingKey(int index, @Nullable  K k) {
     }
 
     @SuppressWarnings("unchecked")
-    void addingValue(int index, @Nullable  V v, @Nullable Object k) {
+    void addingValue(int index, @Nullable V v, @Nullable Object k) {
         assert !myInKeyUpdate;
 
         myInKeyUpdate = true;
@@ -246,7 +246,7 @@ public boolean containsValue(@Nullable Object o) {
     }
 
     @Override
-    public @Nullable V put(@Nullable  K k, @Nullable  V v) {
+    public @Nullable V put(@Nullable K k, @Nullable V v) {
         return putKeyValue(k, v);
     }
 
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/iteration/ReversiblePeekingIterator.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/collection/iteration/ReversiblePeekingIterator.java
@@ -1,6 +1,5 @@
 package com.vladsch.flexmark.util.collection.iteration;
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public interface ReversiblePeekingIterator<E> extends ReversibleIterator<E> {
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/DataHolder.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/DataHolder.java
@@ -13,8 +13,8 @@ public interface DataHolder {
     boolean contains(@NotNull DataKeyBase<?> key);
 
     /**
-     * @param key  data key
-     * @param <T>  Type returned by key
+     * @param key data key
+     * @param <T> Type returned by key
      * @return Use key.get(dataHolder) instead
      */
     @Deprecated
@@ -25,15 +25,15 @@ default <T> T get(@NotNull DataKey<T> key) {
 
     /**
      * Get key if it exists or compute using supplier
-     *
+     * <p>
      * Method used by DataKey classes to access data.
-     *
+     * <p>
      * NOTE: MutableDataHolders will compute an absent key and add it to its dataSet.
-     *   DataHolders will return computed value but not change contained dataSet
-     *   because they are immutable. So value will be computed every time it is requested.
+     * DataHolders will return computed value but not change contained dataSet
+     * because they are immutable. So value will be computed every time it is requested.
      *
-     * @param key data key
-     * @param factory  factory taking this data holder and computing/providing default value
+     * @param key     data key
+     * @param factory factory taking this data holder and computing/providing default value
      * @return object value for the key
      */
     Object getOrCompute(@NotNull DataKeyBase<?> key, @NotNull DataValueFactory<?> factory);
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/DataKeyBase.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/DataKeyBase.java
@@ -64,7 +64,7 @@ public T get(@Nullable DataHolder holder) {
     }
 
     /**
-     * @param holder    data holder
+     * @param holder data holder
      * @return return default value if holder is null, current value in holder or compute a new value
      * @deprecated use get
      */
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/DataNotNullValueFactory.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/DataNotNullValueFactory.java
@@ -1,9 +1,6 @@
 package com.vladsch.flexmark.util.data;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Function;
 
 public interface DataNotNullValueFactory<T> extends DataValueFactory<T> {
     @Override
diff --git a/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/NullableDataKey.java b/flexmark-util/src/main/java/com/vladsch/flexmark/util/data/NullableDataKey.java
@@ -36,8 +36,8 @@ public NullableDataKey(@NotNull String name, @NotNull DataValueNullableFactory<T
      * <p>
      * Use this constructor to ensure that factory is never called with null data holder value
      *
-     * @param name         See {@link #getName()}.
-     * @param supplier     data value factory for creating a new default value for the key not dependent on dataHolder
+     * @param name     See {@link #getName()}.
+     * @param supplier data value factory for creating a new default value for the key not dependent on dataHolder
      */
     public NullableDataKey(@NotNull String name, @NotNull Supplier<T> supplier) {
         super(name, supplier.get(), (holder) -> supplier.get());
@@ -62,6 +62,7 @@ public NullableDataKey(@NotNull String name, @Nullable T defaultValue) {
 
     /**
      * Create a DataKey with null default value and factory producing null values
+     *
      * @param name key name
      */
     public NullableDataKey(@NotNull String name) {
diff --git a/flexmark-util/src/test/java/com/vladsch/flexmark/util/collection/CollectionHostValidator.java b/flexmark-util/src/test/java/com/vladsch/flexmark/util/collection/CollectionHostValidator.java
@@ -2,7 +2,6 @@
 
 import com.vladsch.flexmark.util.Pair;
 import com.vladsch.flexmark.util.Paired;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
 
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/formatter/NodeFormatterSubContext.java b/flexmark/src/main/java/com/vladsch/flexmark/formatter/NodeFormatterSubContext.java
@@ -2,7 +2,6 @@
 
 import com.vladsch.flexmark.util.ast.Node;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/InlineParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/InlineParser.java
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/ListOptions.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/ListOptions.java
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/CommonmarkInlineParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/CommonmarkInlineParser.java
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/InlineParserImpl.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/InlineParserImpl.java

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class TocExtension implements Parser.ParserExtension, HtmlRenderer.HtmlRe`
`40`	`40`
`41`	`41`	`// format options`
`42`	`42`	`public static final DataKey<SimTocGenerateOnFormat> FORMAT_UPDATE_ON_FORMAT = new DataKey<>("FORMAT_UPDATE_ON_FORMAT", SimTocGenerateOnFormat.UPDATE);`
`43`		`- public static final DataKey<TocOptions> FORMAT_OPTIONS = new DataKey<>("FORMAT_OPTIONS", new TocOptions(null,false), options -> new TocOptions(options, false));`
	`43`	`+ public static final DataKey<TocOptions> FORMAT_OPTIONS = new DataKey<>("FORMAT_OPTIONS", new TocOptions(null, false), options -> new TocOptions(options, false));`
`44`	`44`
`45`	`45`	`private TocExtension() {`
`46`	`46`	`}`