Remove redundant @NullMarked on classes in annotated packages

Resolves gh-6980

Author: shakuzen

micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java

@@ -23,7 +23,6 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Method;
@@ -77,7 +76,6 @@
  * @see Counted
  */
 @Aspect
-@NullMarked
 public class CountedAspect {
 
     private static final WarnThenDebugLogger WARN_THEN_DEBUG_LOGGER = new WarnThenDebugLogger(CountedAspect.class);

micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java

@@ -25,7 +25,6 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.lang.reflect.Method;
@@ -87,7 +86,6 @@
  * @since 1.0.0
  */
 @Aspect
-@NullMarked
 @Incubating(since = "1.0.0")
 public class TimedAspect {
 

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CacheMeterBinder.java

@@ -17,7 +17,6 @@
 
 import io.micrometer.core.instrument.*;
 import io.micrometer.core.instrument.binder.MeterBinder;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.lang.ref.WeakReference;
@@ -33,7 +32,6 @@
  *
  * @author Jon Schneider
  */
-@NullMarked
 public abstract class CacheMeterBinder<C> implements MeterBinder {
 
     private static final String DESCRIPTION_CACHE_GETS = "The number of times cache lookup methods have returned a cached (hit) or uncached (newly loaded or null) value (miss).";

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineCacheMetrics.java

@@ -23,7 +23,6 @@
 import io.micrometer.common.util.internal.logging.InternalLogger;
 import io.micrometer.common.util.internal.logging.InternalLoggerFactory;
 import io.micrometer.core.instrument.*;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.concurrent.TimeUnit;
@@ -43,7 +42,6 @@
  * @author Clint Checketts
  * @see CaffeineStatsCounter
  */
-@NullMarked
 public class CaffeineCacheMetrics<K, V extends @Nullable Object, C extends Cache<K, V>> extends CacheMeterBinder<C> {
 
     private static final String DESCRIPTION_CACHE_LOAD = "The number of times cache lookup methods have successfully loaded a new value or failed to load a new value, either because no value was found or an exception was thrown while loading";

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/CaffeineStatsCounter.java

@@ -20,7 +20,6 @@
 import com.github.benmanes.caffeine.cache.stats.CacheStats;
 import com.github.benmanes.caffeine.cache.stats.StatsCounter;
 import io.micrometer.core.instrument.*;
-import org.jspecify.annotations.NullMarked;
 
 import java.util.Arrays;
 import java.util.EnumMap;
@@ -51,7 +50,6 @@
  * @see CaffeineCacheMetrics
  * @since 1.7.0
  */
-@NullMarked
 public final class CaffeineStatsCounter implements StatsCounter {
 
     private static final String DESCRIPTION_CACHE_GETS = "The number of times cache lookup methods have returned a cached (hit) or uncached (newly loaded) value (miss).";

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/EhCache2Metrics.java

@@ -19,7 +19,6 @@
 import io.micrometer.core.instrument.binder.BaseUnits;
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.statistics.StatisticsGateway;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.function.Function;
@@ -31,7 +30,6 @@
  *
  * @author Jon Schneider
  */
-@NullMarked
 public class EhCache2Metrics extends CacheMeterBinder<Ehcache> {
 
     private static final String DESCRIPTION_CACHE_PUTS_ADDED = "Cache puts (added or updated)";

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/GuavaCacheMetrics.java

@@ -19,7 +19,6 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.LoadingCache;
 import io.micrometer.core.instrument.*;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.concurrent.TimeUnit;
@@ -29,7 +28,6 @@
 /**
  * @author Jon Schneider
  */
-@NullMarked
 public class GuavaCacheMetrics<K, V, C extends Cache<K, V>> extends CacheMeterBinder<C> {
 
     private static final String DESCRIPTION_CACHE_LOAD = "The number of times cache lookup methods have successfully loaded a new value or failed to load a new value because an exception was thrown while loading";

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/HazelcastCacheMetrics.java

@@ -18,7 +18,6 @@
 import io.micrometer.core.instrument.*;
 import io.micrometer.core.instrument.binder.BaseUnits;
 import io.micrometer.core.instrument.binder.cache.HazelcastIMapAdapter.LocalMapStats;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
@@ -32,7 +31,6 @@
  *
  * @author Jon Schneider
  */
-@NullMarked
 public class HazelcastCacheMetrics extends CacheMeterBinder<Object> {
 
     private static final String DESCRIPTION_CACHE_ENTRIES = "The number of entries held by this member";

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/cache/JCacheMetrics.java

@@ -17,7 +17,6 @@
 
 import io.micrometer.core.instrument.*;
 import io.micrometer.core.instrument.config.InvalidConfigurationException;
-import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
 import javax.cache.Cache;
@@ -35,7 +34,6 @@
  *
  * @author Jon Schneider
  */
-@NullMarked
 public class JCacheMetrics<K, V, C extends Cache<K, V>> extends CacheMeterBinder<C> {
 
     // VisibleForTesting

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/db/DatabaseTableMetrics.java

@@ -21,7 +21,6 @@
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.binder.BaseUnits;
 import io.micrometer.core.instrument.binder.MeterBinder;
-import org.jspecify.annotations.NullMarked;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -33,7 +32,6 @@
 /**
  * @author Jon Schneider
  */
-@NullMarked
 public class DatabaseTableMetrics implements MeterBinder {
 
     private final DataSource dataSource;