Drop if necessary - Be smart on media type registration.

Use the (at) EnableHypermediaSupport annotation to only register configured media types, their configuration and jackson mappings which saves about 2.5 MB

Author: christophstrobl

spring-aot/src/main/java/org/springframework/nativex/type/Type.java

@@ -67,6 +67,8 @@
 import org.springframework.nativex.hint.TypeHint;
 import org.springframework.nativex.hint.TypeHints;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * @author Andy Clement
@@ -627,7 +629,34 @@ public void getAnnotationValuesInHierarchy(String lookingFor, List<String> seen,
 				if (anno.desc.equals(lookingFor)) {
 					List<Object> os = anno.values;
 					for (int i = 0; i < os.size(); i += 2) {
-						collector.put(os.get(i).toString(), os.get(i + 1).toString());
+						if(os.get(i+1) instanceof List) {
+
+							List<String> resolvedAttributeValues = new ArrayList<>();
+
+							for(Object attributeValue : (List)os.get(i+1)) {
+
+								if(!ObjectUtils.isArray(attributeValue)) {
+									resolvedAttributeValues.add(attributeValue.toString());
+									continue;
+								}
+
+								String attributeValueStringRepresentation = "";
+								String[] args = (String[]) attributeValue;
+								if(args[0].startsWith("L") && args[0].endsWith(";")) {
+									Type resolve = typeSystem.Lresolve(args[0], true);
+									if(resolve != null) {
+										attributeValueStringRepresentation = resolve.getDottedName();
+									}
+								}
+								if(args.length > 1) {
+									attributeValueStringRepresentation += ("." + args[1]);
+								}
+								resolvedAttributeValues.add(attributeValueStringRepresentation);
+							}
+							collector.put(os.get(i).toString(), StringUtils.collectionToDelimitedString(resolvedAttributeValues, ";"));
+						} else {
+							collector.put(os.get(i).toString(), os.get(i + 1).toString());
+						}
 					}
 				}
 				try {

spring-native-configuration/src/main/java/org/springframework/hateoas/config/HateoasHints.java

@@ -18,6 +18,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.springframework.boot.autoconfigure.hateoas.HypermediaAutoConfiguration;
 import org.springframework.boot.autoconfigure.hateoas.HypermediaHttpMessageConverterConfiguration;
@@ -44,6 +47,7 @@
 import org.springframework.nativex.type.Type;
 import org.springframework.nativex.type.TypeProcessor;
 import org.springframework.nativex.type.TypeSystem;
+import org.springframework.util.StringUtils;
 
 
 @NativeHint(trigger = WebStackImportSelector.class, types = {
@@ -94,23 +98,64 @@ public class HateoasHints implements NativeConfiguration {
 
 	private static final String ENTITY_LINKS = "org/springframework/hateoas/server/EntityLinks";
 	private static final String JACKSON_ANNOTATION = "Lcom/fasterxml/jackson/annotation/JacksonAnnotation;";
+	private static final String ENABLE_HYPERMEDIA_SUPPORT = "Lorg/springframework/hateoas/config/EnableHypermediaSupport;";
 
 	@Override
 	public List<HintDeclaration> computeHints(TypeSystem typeSystem) {
 
+		Set<String> hypermediaFormats = computeConfiguredHypermediaFormats(typeSystem);
+
 		List<HintDeclaration> hints = new ArrayList<>();
 
-		hints.addAll(computeAtConfigurationClasses(typeSystem));
+		hints.addAll(computeAtConfigurationClasses(typeSystem, hypermediaFormats));
 		hints.addAll(computeRepresentationModels(typeSystem));
 		hints.addAll(computeEntityLinks(typeSystem));
-		hints.addAll(computeJacksonMappings(typeSystem));
+		hints.addAll(computeJacksonMappings(typeSystem, hypermediaFormats));
 
 		return hints;
 	}
 
-	private List<HintDeclaration> computeAtConfigurationClasses(TypeSystem typeSystem) {
+	private Set<String> computeConfiguredHypermediaFormats(TypeSystem typeSystem) {
+
+		return typeSystem.scanUserCodeDirectoriesAndSpringJars(type -> {
+			try {
+				return type.isAnnotated(ENABLE_HYPERMEDIA_SUPPORT);
+			} catch (MissingTypeException e) {
+				return false;
+			}
+		})
+				.flatMap(type -> {
+					try {
+						String formats = type.getAnnotationValuesInHierarchy(ENABLE_HYPERMEDIA_SUPPORT).getOrDefault("type", "");
+						return StringUtils.hasText(formats) ? Stream.of(formats.split(";")) : Stream.empty();
+					} catch (MissingTypeException ex) {
+						return Stream.empty();
+					}
+				})
+				.map(it -> {
+					String value = it.replaceAll(".*org\\.springframework\\.hateoas\\.config\\.EnableHypermediaSupport\\$HypermediaType\\.", "").toLowerCase();
+					switch (value) {
+						case "hal_forms":
+							return "hal";
+						case "collection_json":
+							return "collectionjson";
+						default:
+							return value;
+					}
+				})
+				.collect(Collectors.toSet());
+	}
+
+
+	private List<HintDeclaration> computeAtConfigurationClasses(TypeSystem typeSystem, Set<String> hypermediaFormats) {
 
 		return TypeProcessor.namedProcessor("HateoasHints - Configuration Classes")
+				.skipTypesMatching(type -> {
+					if (type.isPartOfDomain("org.springframework.hateoas.mediatype")) {
+						return !isSupportedHypermediaFormat(type, hypermediaFormats);
+					}
+					return false;
+				})
 				.skipAnnotationInspection()
 				.skipMethodInspection()
 				.skipFieldInspection()
@@ -159,7 +204,7 @@ List<HintDeclaration> computeRepresentationModels(TypeSystem typeSystem) {
 				});
 	}
 
-	List<HintDeclaration> computeJacksonMappings(TypeSystem typeSystem) {
+	List<HintDeclaration> computeJacksonMappings(TypeSystem typeSystem, Set<String> hypermediaFormats) {
 
 		return TypeProcessor.namedProcessor("HateoasHints - Jackson Mapping Candidates")
 				.skipTypesMatching(type -> {
@@ -170,6 +215,7 @@ List<HintDeclaration> computeJacksonMappings(TypeSystem typeSystem) {
 						if (!type.isPartOfDomain("org.springframework.hateoas.")) {
 							return true;
 						}
+						return !isSupportedHypermediaFormat(type, hypermediaFormats);
 					}
 					return false;
 				})
@@ -212,4 +258,26 @@ private boolean usesJackson(Type type) {
 
 		return false;
 	}
+
+	private boolean isSupportedHypermediaFormat(Type type, Set<String> hypermediaFormats) {
+
+		if (hypermediaFormats.isEmpty()) {
+			return true;
+		}
+
+		if (!type.isPartOfDomain("org.springframework.hateoas.mediatype")) {
+			return true;
+		}
+
+		if (type.getPackageName().equals("org.springframework.hateoas.mediatype")) {
+			return true;
+		}
+
+		for (String hypermediaFormat : hypermediaFormats) {
+			if (type.getPackageName().contains(hypermediaFormat)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

spring-native-configuration/src/test/java/org/springframework/hateoas/config/HateoasHintsTests.java

@@ -67,7 +67,7 @@ public void computesModelAndModelProcessorCorrectly() {
 	@Test
 	public void jackson() {
 
-		List<HintDeclaration> hintDeclarations = hateoasHints.computeJacksonMappings(typeSystem);
+		List<HintDeclaration> hintDeclarations = hateoasHints.computeJacksonMappings(typeSystem, Collections.emptySet());
 		assertHints(hintDeclarations)
 				// Assert only the ones using jackson
 				.hasSize(7)