cleanup

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/EmbeddedConfigFile.java

@@ -31,14 +31,14 @@ private EmbeddedConfigFile() {
   }
 
   static OpenTelemetryConfigurationModel extractModel(ConfigurableEnvironment environment) {
-    Map<String, Object> props = extractSpringProperties(environment);
+    Map<String, String> props = extractSpringProperties(environment);
     return convertToOpenTelemetryConfigurationModel(props);
   }
 
-  private static Map<String, Object> extractSpringProperties(ConfigurableEnvironment environment) {
+  private static Map<String, String> extractSpringProperties(ConfigurableEnvironment environment) {
     MutablePropertySources propertySources = environment.getPropertySources();
 
-    Map<String, Object> props = new HashMap<>();
+    Map<String, String> props = new HashMap<>();
     for (PropertySource<?> propertySource : propertySources) {
       if (propertySource instanceof EnumerablePropertySource<?>) {
         for (String propertyName :
@@ -61,7 +61,7 @@ private static Map<String, Object> extractSpringProperties(ConfigurableEnvironme
   }
 
   static OpenTelemetryConfigurationModel convertToOpenTelemetryConfigurationModel(
-      Map<String, Object> flatProps) {
+      Map<String, String> flatProps) {
     Map<String, Object> nested = convertFlatPropsToNested(flatProps);
 
     return getObjectMapper().convertValue(nested, OpenTelemetryConfigurationModel.class);
@@ -83,12 +83,12 @@ static ObjectMapper getObjectMapper() {
    * ["one", "two"]}}}}
    */
   @SuppressWarnings("unchecked")
-  static Map<String, Object> convertFlatPropsToNested(Map<String, Object> flatProps) {
+  static Map<String, Object> convertFlatPropsToNested(Map<String, String> flatProps) {
     Map<String, Object> result = new HashMap<>();
 
-    for (Map.Entry<String, Object> entry : flatProps.entrySet()) {
+    for (Map.Entry<String, String> entry : flatProps.entrySet()) {
       String key = entry.getKey();
-      Object value = entry.getValue();
+      String value = entry.getValue();
 
       // Split the key by dots
       String[] parts = key.split("\\.");

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/SpringDeclarativeConfigProperties.java

@@ -90,8 +90,7 @@ public static SpringDeclarativeConfigProperties create(
       }
       if (isMap(value)) {
         SpringDeclarativeConfigProperties configProperties =
-            SpringDeclarativeConfigProperties.create(
-                (Map<String, Object>) value, componentLoader);
+            SpringDeclarativeConfigProperties.create((Map<String, Object>) value, componentLoader);
         mapEntries.put(key, configProperties);
         continue;
       }