Remove unnecessary fully qualified names (#2812)

Author: altro3

Diff for: data-azure-cosmos/src/main/java/io/micronaut/data/cosmos/common/CosmosDatabaseInitializer.java

@@ -44,6 +44,8 @@
 import org.slf4j.LoggerFactory;
 
 import jakarta.annotation.PostConstruct;
+
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -152,7 +154,7 @@ private RuntimePersistentEntity<?>[] getPersistentEntities(CosmosDatabaseConfigu
         return introspections.stream()
             // filter out inner / internal / abstract(MappedSuperClass) classes
             .filter(i -> !i.getBeanType().getName().contains("$"))
-            .filter(i -> !java.lang.reflect.Modifier.isAbstract(i.getBeanType().getModifiers()))
+            .filter(i -> !Modifier.isAbstract(i.getBeanType().getModifiers()))
             .map(e -> runtimeEntityRegistry.getEntity(e.getBeanType())).toArray(RuntimePersistentEntity<?>[]::new);
     }
 

Diff for: data-azure-cosmos/src/main/java/io/micronaut/data/cosmos/common/CosmosEntity.java

@@ -85,7 +85,7 @@ public String getVersionField() {
     }
 
     /**
-     * Creates {@link CosmosEntity} from {@link RuntimePersistentEntity} and {@link io.micronaut.data.cosmos.config.CosmosDatabaseConfiguration.CosmosContainerSettings}.
+     * Creates {@link CosmosEntity} from {@link RuntimePersistentEntity} and {@link CosmosDatabaseConfiguration.CosmosContainerSettings}.
      *
      * @param runtimePersistentEntity the runtime persistent entity
      * @param cosmosContainerSettings the Cosmos container settings
@@ -163,7 +163,7 @@ private static String findPartitionKey(RuntimePersistentEntity<?> runtimePersist
         // Find partition key path
         for (PersistentProperty property : properties) {
             AnnotationValue<PartitionKey> partitionKeyAnnotationValue =
-                property.getAnnotation(io.micronaut.data.cosmos.annotation.PartitionKey.class);
+                property.getAnnotation(PartitionKey.class);
             if (partitionKeyAnnotationValue != null) {
                 if (StringUtils.isNotEmpty(partitionKeyPath)) {
                     throw new IllegalStateException("Multiple @PartitionKey annotations declared on " + runtimePersistentEntity.getPersistedName()

Diff for: data-connection-jdbc/src/main/java/io/micronaut/data/connection/jdbc/advice/DelegatingDataSource.java

@@ -25,8 +25,8 @@
 import javax.sql.DataSource;
 
 /**
- * JDBC {@link javax.sql.DataSource} implementation that delegates all calls
- * to a given target {@link javax.sql.DataSource}.
+ * JDBC {@link DataSource} implementation that delegates all calls
+ * to a given target {@link DataSource}.
  *
  * <p>This class is meant to be subclassed, with subclasses overriding only
  * those methods (such as {@link #getConnection()}) that should not simply

Diff for: data-document-model/src/main/java/io/micronaut/data/document/serde/defaults/DefaultIdDeserializer.java

@@ -24,7 +24,7 @@
 import jakarta.inject.Singleton;
 
 /**
- * Default {@link io.micronaut.data.document.serde.IdDeserializer} implementation.
+ * Default {@link IdDeserializer} implementation.
  *
  * @author radovanradic
  * @author Denis Stepanov

Diff for: data-document-model/src/main/java/io/micronaut/data/document/serde/defaults/DefaultOneRelationDeserializer.java

@@ -24,7 +24,7 @@
 import jakarta.inject.Singleton;
 
 /**
- * Default {@link io.micronaut.data.document.serde.OneRelationDeserializer} implementation.
+ * Default {@link OneRelationDeserializer} implementation.
  *
  * @author radovanradic
  * @author Denis Stepanov

Diff for: data-document-processor/src/main/java/io/micronaut/data/document/processor/mapper/MappedPropertyMapper.java

@@ -37,11 +37,11 @@
  * @author Denis Stepanov
  * @since 3.3
  */
-public class MappedPropertyMapper implements TypedAnnotationMapper<io.micronaut.data.annotation.MappedProperty> {
+public class MappedPropertyMapper implements TypedAnnotationMapper<MappedProperty> {
 
     @Override
-    public Class<io.micronaut.data.annotation.MappedProperty> annotationType() {
-        return io.micronaut.data.annotation.MappedProperty.class;
+    public Class<MappedProperty> annotationType() {
+        return MappedProperty.class;
     }
 
     @Override

Diff for: data-document-processor/src/main/java/io/micronaut/data/document/processor/matchers/MongoRawQueryMethodMatcher.java

@@ -48,6 +48,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -293,7 +294,7 @@ public Map<String, String> getAdditionalRequiredParameters() {
     }
 
     private String processCustomQuery(MethodMatchContext matchContext, String queryString, List<ParameterElement> parameters, ParameterElement entityParam, SourcePersistentEntity persistentEntity, List<QueryParameterBinding> parameterBindings) {
-        java.util.regex.Matcher matcher = VARIABLE_PATTERN.matcher(queryString);
+        Matcher matcher = VARIABLE_PATTERN.matcher(queryString);
         List<String> queryParts = new ArrayList<>();
         int lastOffset = 0;
         while (matcher.find()) {

Diff for: data-document-tck/src/main/java/io/micronaut/data/document/tck/repositories/PersonRepository.java

@@ -19,6 +19,7 @@
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.data.annotation.Id;
 import io.micronaut.data.document.tck.entities.Person;
+import io.micronaut.data.model.Page;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.data.model.Slice;
 import io.micronaut.data.model.Sort;
@@ -58,9 +59,9 @@ public interface PersonRepository extends CrudRepository<Person, String>, Pageab
 
     List<Person> findByNameRegex(String name, Pageable pageable);
 
-    io.micronaut.data.model.Page<Person> getByNameRegex(String name, Pageable pageable);
+    Page<Person> getByNameRegex(String name, Pageable pageable);
 
-    io.micronaut.data.model.Page<Person> findAllByNameRegex(String name, Pageable pageable);
+    Page<Person> findAllByNameRegex(String name, Pageable pageable);
 
     Slice<Person> queryByNameRegex(String name, Pageable pageable);
 

Diff for: data-hibernate-jpa/src/test/java/io/micronaut/data/hibernate/entities/FavoriteStudents.java

@@ -8,6 +8,8 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
+import jakarta.persistence.Version;
+
 import java.util.List;
 import java.util.UUID;
 
@@ -17,7 +19,7 @@ public class FavoriteStudents {
     @Id
     @Column(columnDefinition = "uuid")
     private UUID id;
-    @jakarta.persistence.Version
+    @Version
     private Integer version;
 
     @OneToOne(cascade = CascadeType.ALL)

Diff for: data-hibernate-reactive/src/test/java/io/micronaut/data/hibernate/reactive/entities/FavoriteStudents.java

@@ -7,6 +7,8 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
+import jakarta.persistence.Version;
+
 import java.util.List;
 import java.util.UUID;
 
@@ -15,7 +17,7 @@ public class FavoriteStudents {
 
     @Id
     private UUID id;
-    @jakarta.persistence.Version
+    @Version
     private Integer version;
 
     @OneToOne(cascade = CascadeType.ALL)

Diff for: data-jdbc/src/main/java/io/micronaut/data/jdbc/mapper/JdbcQueryStatement.java

@@ -154,7 +154,7 @@ public QueryStatement<PreparedStatement, Integer> setValue(PreparedStatement sta
                 statement.setArray(index, (Array) value);
             } else if (value != null) {
                 if (value.getClass().isEnum()) {
-                    statement.setObject(index, value, java.sql.Types.OTHER);
+                    statement.setObject(index, value, Types.OTHER);
                 } else {
                     statement.setObject(index, value);
                 }

Diff for: data-jdbc/src/main/java/io/micronaut/data/jdbc/runtime/JdbcOperations.java

@@ -76,7 +76,7 @@ public interface JdbcOperations {
      * @param rootEntity The entity type
      * @param <T>        The generic type
      * @return The stream
-     * @throws io.micronaut.data.exceptions.DataAccessException If an error occurs reading the result
+     * @throws DataAccessException If an error occurs reading the result
      */
     @NonNull
     <T> Stream<T> entityStream(
@@ -91,7 +91,7 @@ <T> Stream<T> entityStream(
      * @param rootEntity The entity type
      * @param <T>        The generic type
      * @return The stream
-     * @throws io.micronaut.data.exceptions.DataAccessException If an error occurs reading the result
+     * @throws DataAccessException If an error occurs reading the result
      */
     @NonNull
     <T> Stream<T> entityStream(@NonNull ResultSet resultSet, @NonNull Class<T> rootEntity);

Diff for: data-jdbc/src/test/java/io/micronaut/data/jdbc/mysql/MySqlPersonRepository.java

@@ -19,9 +19,10 @@
 import io.micronaut.data.jdbc.annotation.JdbcRepository;
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.tck.entities.Person;
+import io.micronaut.data.tck.repositories.PersonRepository;
 
 @JdbcRepository(dialect = Dialect.MYSQL)
-public interface MySqlPersonRepository extends io.micronaut.data.tck.repositories.PersonRepository {
+public interface MySqlPersonRepository extends PersonRepository {
 
     @Override
     Person save(String name, int age);

Diff for: data-jdbc/src/test/java/io/micronaut/data/jdbc/mysql/MySqlUuidEntity.java

@@ -36,7 +36,7 @@ public class MySqlUuidEntity {
     private UUID id5;
 
     @TypeDef(type = DataType.BYTE_ARRAY)
-    @jakarta.persistence.Convert(converter = JakartaMySqlUUIDBinaryConverter.class)
+    @Convert(converter = JakartaMySqlUUIDBinaryConverter.class)
     @Column(columnDefinition = "binary(16)")
     private UUID id6;
 

Diff for: data-jdbc/src/test/java/io/micronaut/data/jdbc/postgres/PostgresPersonRepository.java

@@ -19,9 +19,10 @@
 import io.micronaut.data.jdbc.annotation.JdbcRepository;
 import io.micronaut.data.model.query.builder.sql.Dialect;
 import io.micronaut.data.tck.entities.Person;
+import io.micronaut.data.tck.repositories.PersonRepository;
 
 @JdbcRepository(dialect = Dialect.POSTGRES)
-public interface PostgresPersonRepository extends io.micronaut.data.tck.repositories.PersonRepository {
+public interface PostgresPersonRepository extends PersonRepository {
 
     @Override
     Person save(String name, int age);

Diff for: data-model/src/main/java/io/micronaut/data/event/listeners/PostPersistEventListener.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Annotation;
 
 /**
- * Functional version or {@link io.micronaut.data.annotation.event.PostPersist} event handlers.
+ * Functional version or {@link PostPersist} event handlers.
  *
  * @param <T> The entity type
  * @author graemerocher

Diff for: data-model/src/main/java/io/micronaut/data/event/listeners/PostRemoveEventListener.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Annotation;
 
 /**
- * Functional version or {@link io.micronaut.data.annotation.event.PostRemove} event handlers.
+ * Functional version or {@link PostRemove} event handlers.
  *
  * @param <T> The entity type
  * @author graemerocher

Diff for: data-model/src/main/java/io/micronaut/data/event/listeners/PostUpdateEventListener.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Annotation;
 
 /**
- * Functional version or {@link io.micronaut.data.annotation.event.PostUpdate} event handlers.
+ * Functional version or {@link PostUpdate} event handlers.
  *
  * @param <T> The entity type
  * @author graemerocher

Diff for: data-model/src/main/java/io/micronaut/data/event/listeners/PrePersistEventListener.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Annotation;
 
 /**
- * Functional version or {@link io.micronaut.data.annotation.event.PrePersist} event handlers.
+ * Functional version or {@link PrePersist} event handlers.
  *
  * @param <T> The entity type
  * @author graemerocher

Diff for: data-model/src/main/java/io/micronaut/data/event/listeners/PreRemoveEventListener.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Annotation;
 
 /**
- * Functional version or {@link io.micronaut.data.annotation.event.PreRemove} event handlers.
+ * Functional version or {@link PreRemove} event handlers.
  *
  * @param <T> The entity type
  * @author graemerocher

Diff for: data-model/src/main/java/io/micronaut/data/event/listeners/PreUpdateEventListener.java

@@ -24,7 +24,7 @@
 import java.lang.annotation.Annotation;
 
 /**
- * Functional version or {@link io.micronaut.data.annotation.event.PreUpdate} event handlers.
+ * Functional version or {@link PreUpdate} event handlers.
  *
  * @param <T> The entity type
  * @author graemerocher

Diff for: data-model/src/main/java/io/micronaut/data/intercept/async/FindSliceAsyncInterceptor.java

@@ -21,7 +21,7 @@
 import java.util.concurrent.CompletionStage;
 
 /**
- * An interceptor that executes a query and returns a {@link io.micronaut.data.model.Slice} asynchronously.
+ * An interceptor that executes a query and returns a {@link Slice} asynchronously.
  *
  * @param <T> The declaring type
  * @author graemerocher

Diff for: data-model/src/main/java/io/micronaut/data/model/DataType.java

@@ -40,7 +40,7 @@
  */
 public enum DataType {
     /**
-     * A big decimal such as {@link java.math.BigDecimal}.
+     * A big decimal such as {@link BigDecimal}.
      */
     BIGDECIMAL(BigDecimal.class, BigInteger.class),
     /**
@@ -60,11 +60,11 @@ public enum DataType {
      */
     CHARACTER(Character.class),
     /**
-     * A date such as {@link java.util.Date} or {@link java.time.LocalDate}.
+     * A date such as {@link java.util.Date} or {@link LocalDate}.
      */
     DATE(Date.class, java.sql.Date.class, LocalDate.class),
     /**
-     * A timestamp such as {@link java.sql.Timestamp} or {@link java.time.Instant}.
+     * A timestamp such as {@link Timestamp} or {@link Instant}.
      */
     TIMESTAMP(Timestamp.class, Instant.class, OffsetDateTime.class, ZonedDateTime.class),
     /**

Diff for: data-model/src/main/java/io/micronaut/data/model/jpa/criteria/PersistentEntityFrom.java

@@ -18,6 +18,8 @@
 import io.micronaut.core.annotation.Experimental;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.annotation.Nullable;
+import io.micronaut.data.annotation.Join;
+
 import jakarta.persistence.criteria.From;
 import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.metamodel.CollectionAttribute;
@@ -50,7 +52,7 @@ public interface PersistentEntityFrom<OwnerType, AssociatedEntityType> extends F
      * @return The joined entity
      */
     @NonNull
-    <X, Y> PersistentEntityJoin<X, Y> join(@NonNull String attributeName, @NonNull io.micronaut.data.annotation.Join.Type joinType);
+    <X, Y> PersistentEntityJoin<X, Y> join(@NonNull String attributeName, @NonNull Join.Type joinType);
 
     /**
      * Joins the entity with specific join type.
@@ -63,7 +65,7 @@ public interface PersistentEntityFrom<OwnerType, AssociatedEntityType> extends F
      * @return The joined entity
      */
     @NonNull
-    <X, Y> PersistentEntityJoin<X, Y> join(@NonNull String attributeName, @NonNull io.micronaut.data.annotation.Join.Type joinType, @NonNull String alias);
+    <X, Y> PersistentEntityJoin<X, Y> join(@NonNull String attributeName, @NonNull Join.Type joinType, @NonNull String alias);
 
     @NonNull
     @Override

Diff for: data-model/src/main/java/io/micronaut/data/model/jpa/criteria/impl/AbstractPersistentEntityJoinSupport.java

@@ -44,6 +44,7 @@
 import jakarta.persistence.metamodel.SetAttribute;
 import jakarta.persistence.metamodel.SingularAttribute;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -124,7 +125,7 @@ public <K, V, M extends Map<K, V>> Expression<M> get(MapAttribute<E, K, V> map)
     }
 
     @Override
-    public <K, C extends java.util.Collection<K>> Expression<C> get(PluralAttribute<E, C, K> collection) {
+    public <K, C extends Collection<K>> Expression<C> get(PluralAttribute<E, C, K> collection) {
         return get(collection.getName());
     }
 

Diff for: data-model/src/main/java/io/micronaut/data/model/query/BindingContextImpl.java

@@ -18,7 +18,7 @@
 import io.micronaut.data.model.PersistentPropertyPath;
 
 /**
- * Default implementation of {@link io.micronaut.data.model.query.BindingParameter.BindingContext}.
+ * Default implementation of {@link BindingParameter.BindingContext}.
  *
  * @author Denis Stepanov
  * @since 3.2