Polishing.

Trim trailing white spaces. Introduce getRequiredMetamodel(…) to refine nullability handling. Use diamond syntax and method handles where possible.

See #2383

Author: mp911de

Diff for: src/main/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContext.java

@@ -67,7 +67,8 @@ public JpaMetamodelMappingContext(Set<Metamodel> models) {
 	 */
 	@Override
 	protected <T> JpaPersistentEntityImpl<?> createPersistentEntity(TypeInformation<T> typeInformation) {
-		return new JpaPersistentEntityImpl<T>(typeInformation, persistenceProvider, models.getMetamodel(typeInformation));
+		return new JpaPersistentEntityImpl<>(typeInformation, persistenceProvider,
+				models.getRequiredMetamodel(typeInformation));
 	}
 
 	/*
@@ -91,17 +92,17 @@ protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
 
 	/**
 	 * We customize the lookup of {@link PersistentPropertyPaths} by also traversing properties that are embeddables.
-	 * 
+	 *
 	 * @see org.springframework.data.mapping.context.AbstractMappingContext#findPersistentPropertyPaths(java.lang.Class,
 	 *      java.util.function.Predicate)
 	 */
 	@Override
 	public <T> PersistentPropertyPaths<T, JpaPersistentProperty> findPersistentPropertyPaths(Class<T> type,
 			Predicate<? super JpaPersistentProperty> predicate) {
-		return doFindPersistentPropertyPaths(type, predicate, it -> it.isEmbeddable());
+		return doFindPersistentPropertyPaths(type, predicate, JpaPersistentProperty::isEmbeddable);
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.context.AbstractMappingContext#hasPersistentEntityFor(java.lang.Class)
 	 */
@@ -126,7 +127,7 @@ private Metamodels(Set<Metamodel> metamodels) {
 
 		/**
 		 * Returns the {@link JpaMetamodel} for the given type.
-		 * 
+		 *
 		 * @param type must not be {@literal null}.
 		 * @return
 		 */
@@ -138,9 +139,29 @@ public JpaMetamodel getMetamodel(TypeInformation<?> type) {
 			return metamodel == null ? null : JpaMetamodel.of(metamodel);
 		}
 
+		/**
+		 * Returns the required {@link JpaMetamodel} for the given type or throw {@link IllegalArgumentException} if the
+		 * {@code type} is not JPA-managed.
+		 *
+		 * @param type must not be {@literal null}.
+		 * @return
+		 * @throws IllegalArgumentException if {@code type} is not JPA-managed.
+		 * @since 2.6.1
+		 */
+		public JpaMetamodel getRequiredMetamodel(TypeInformation<?> type) {
+
+			JpaMetamodel metamodel = getMetamodel(type);
+
+			if (metamodel == null) {
+				throw new IllegalArgumentException(String.format("Required JpaMetamodel not found for %s!", type));
+			}
+
+			return metamodel;
+		}
+
 		/**
 		 * Returns whether the given type is managed by one of the underlying {@link Metamodel} instances.
-		 * 
+		 *
 		 * @param type must not be {@literal null}.
 		 * @return
 		 */
@@ -150,7 +171,7 @@ public boolean isMetamodelManagedType(TypeInformation<?> type) {
 
 		/**
 		 * Returns whether the given type is managed by one of the underlying {@link Metamodel} instances.
-		 * 
+		 *
 		 * @param type must not be {@literal null}.
 		 * @return
 		 */

Diff for: src/test/java/org/springframework/data/jpa/mapping/JpaMetamodelMappingContextIntegrationTests.java

@@ -57,7 +57,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
-public class JpaMetamodelMappingContextIntegrationTests {
+class JpaMetamodelMappingContextIntegrationTests {
 
 	private JpaMetamodelMappingContext context;
 	@Autowired ProductRepository products;