Polish "Add Java InfoContributor"

See spring-projectsgh-28136

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import org.springframework.boot.actuate.info.EnvironmentInfoContributor;
 import org.springframework.boot.actuate.info.GitInfoContributor;
 import org.springframework.boot.actuate.info.InfoContributor;
-import org.springframework.boot.actuate.info.java.JavaInfoContributor;
+import org.springframework.boot.actuate.info.JavaInfoContributor;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -82,7 +82,7 @@ public InfoContributor buildInfoContributor(BuildProperties buildProperties) {
 	@Bean
 	@ConditionalOnEnabledInfoContributor("java")
 	@Order(DEFAULT_ORDER)
-	public InfoContributor javaInfoContributor() {
+	public JavaInfoContributor javaInfoContributor() {
 		return new JavaInfoContributor();
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoContributorAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.info;
 
-import java.util.Map;
-import java.util.Properties;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -27,15 +24,18 @@
 import org.springframework.boot.actuate.info.GitInfoContributor;
 import org.springframework.boot.actuate.info.Info;
 import org.springframework.boot.actuate.info.InfoContributor;
-import org.springframework.boot.actuate.info.java.JavaInfo;
-import org.springframework.boot.actuate.info.java.JavaInfoContributor;
+import org.springframework.boot.info.JavaInfo;
+import org.springframework.boot.actuate.info.JavaInfoContributor;
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.info.GitProperties;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Map;
+import java.util.Properties;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/java/JavaInfoContributor.java renamed to spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/JavaInfoContributor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2021 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.info.java;
+package org.springframework.boot.actuate.info;
 
 import org.springframework.boot.actuate.info.Info.Builder;
-import org.springframework.boot.actuate.info.InfoContributor;
+import org.springframework.boot.info.JavaInfo;
 
 /**
  * An {@link InfoContributor} that exposes {@link JavaInfo}.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/java/JavaInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2021 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.info.java;
+package org.springframework.boot.actuate.info;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.actuate.info.Info;
+import org.springframework.boot.info.JavaInfo;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -34,17 +34,8 @@ void javaInfoShouldBeAdded() {
 		JavaInfoContributor javaInfoContributor = new JavaInfoContributor();
 		Info.Builder builder = new Info.Builder();
 		javaInfoContributor.contribute(builder);
-
-		assertThat(builder.build().getDetails().get("java")).isInstanceOf(JavaInfo.class);
-		JavaInfo javaInfo = (JavaInfo) builder.build().getDetails().get("java");
-
-		assertThat(javaInfo.getVendor()).isEqualTo(System.getProperty("java.vendor"));
-		assertThat(javaInfo.getVersion()).isEqualTo(System.getProperty("java.version"));
-		assertThat(javaInfo.getRuntime().getName()).isEqualTo(System.getProperty("java.runtime.name"));
-		assertThat(javaInfo.getRuntime().getVersion()).isEqualTo(System.getProperty("java.runtime.version"));
-		assertThat(javaInfo.getVm().getName()).isEqualTo(System.getProperty("java.vm.name"));
-		assertThat(javaInfo.getVm().getVendor()).isEqualTo(System.getProperty("java.vm.vendor"));
-		assertThat(javaInfo.getVm().getVersion()).isEqualTo(System.getProperty("java.vm.version"));
+		Info info = builder.build();
+		assertThat(info.getDetails().get("java")).isInstanceOf(JavaInfo.class);
 	}
 
 }