Adding missing package-info to core packages

spring-ai-core/src/main/java/org/springframework/ai/aot/KnuddelsRuntimeHints.java

@@ -18,11 +18,12 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.lang.Nullable;
 
 public class KnuddelsRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		hints.resources().registerResource(new ClassPathResource("/com/knuddels/jtokkit/cl100k_base.tiktoken"));
 	}
 

spring-ai-core/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java

@@ -29,7 +29,6 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 
@@ -39,7 +38,7 @@
 public class SpringAiCoreRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
-	public void registerHints(@NonNull RuntimeHints hints, @Nullable ClassLoader classLoader) {
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 
 		var chatTypes = Set.of(AbstractMessage.class, AssistantMessage.class, ToolResponseMessage.class, Message.class,
 				MessageType.class, UserMessage.class, SystemMessage.class, FunctionCallbackContext.class,

spring-ai-core/src/main/java/org/springframework/ai/aot/package-info.java

@@ -0,0 +1,9 @@
+/**
+ * Package for AOT runtime hints.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.ai.aot;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;

spring-ai-core/src/main/java/org/springframework/ai/audio/transcription/AudioTranscription.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 - 2024 the original author or authors.
+ * Copyright 2023-2024 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.audio.transcription;
 
 import org.springframework.ai.model.ModelResult;
@@ -25,12 +26,14 @@
  *
  * @author Michael Lavelle
  * @author Piotr Olaszewski
+ * @author Soby Chacko
  * @since 0.8.1
  */
 public class AudioTranscription implements ModelResult<String> {
 
 	private final String text;
 
+	@Nullable
 	private AudioTranscriptionMetadata transcriptionMetadata;
 
 	public AudioTranscription(String text) {

spring-ai-core/src/main/java/org/springframework/ai/audio/transcription/AudioTranscriptionMetadata.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 - 2024 the original author or authors.
+ * Copyright 2023-2024 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.audio.transcription;
 
 import org.springframework.ai.model.ResultMetadata;

spring-ai-core/src/main/java/org/springframework/ai/audio/transcription/AudioTranscriptionOptions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 - 2024 the original author or authors.
+ * Copyright 2023-2024 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.audio.transcription;
 
 import org.springframework.ai.model.ModelOptions;

spring-ai-core/src/main/java/org/springframework/ai/audio/transcription/AudioTranscriptionPrompt.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 - 2024 the original author or authors.
+ * Copyright 2023-2024 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.
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.audio.transcription;
 
 import org.springframework.ai.model.ModelRequest;
 import org.springframework.core.io.Resource;
+import org.springframework.lang.Nullable;
 
 /**
  * Represents an audio transcription prompt for an AI model. It implements the
@@ -25,12 +27,14 @@
  *
  * @author Michael Lavelle
  * @author Piotr Olaszewski
+ * @author Soby Chacko
  * @since 0.8.1
  */
 public class AudioTranscriptionPrompt implements ModelRequest<Resource> {
 
 	private final Resource audioResource;
 
+	@Nullable
 	private AudioTranscriptionOptions modelOptions;
 
 	/**
@@ -50,7 +54,7 @@ public AudioTranscriptionPrompt(Resource audioResource) {
 	 * @param audioResource resource of the audio file.
 	 * @param modelOptions
 	 */
-	public AudioTranscriptionPrompt(Resource audioResource, AudioTranscriptionOptions modelOptions) {
+	public AudioTranscriptionPrompt(Resource audioResource, @Nullable AudioTranscriptionOptions modelOptions) {
 		this.audioResource = audioResource;
 		this.modelOptions = modelOptions;
 	}
@@ -61,8 +65,9 @@ public Resource getInstructions() {
 	}
 
 	@Override
+	@Nullable
 	public AudioTranscriptionOptions getOptions() {
-		return modelOptions;
+		return this.modelOptions;
 	}
 
 }

spring-ai-core/src/main/java/org/springframework/ai/audio/transcription/AudioTranscriptionResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 - 2024 the original author or authors.
+ * Copyright 2023-2024 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.audio.transcription;
 
 import org.springframework.ai.model.ModelResponse;

spring-ai-core/src/main/java/org/springframework/ai/audio/transcription/AudioTranscriptionResponseMetadata.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 - 2024 the original author or authors.
+ * Copyright 2023-2024 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.audio.transcription;
 
 import org.springframework.ai.model.MutableResponseMetadata;

spring-ai-core/src/main/java/org/springframework/ai/audio/transcription/package-info.java

@@ -0,0 +1,9 @@
+/**
+ * Package for audio transcription components.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.ai.audio.transcription;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/SimpleLoggerAdvisor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024-2024 the original author or authors.
+ * Copyright 2024 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.chat.client.advisor;
 
 import java.util.Map;
@@ -37,13 +38,9 @@ public class SimpleLoggerAdvisor implements RequestResponseAdvisor {
 
 	private static final Logger logger = LoggerFactory.getLogger(SimpleLoggerAdvisor.class);
 
-	public static final Function<AdvisedRequest, String> DEFAULT_REQUEST_TO_STRING = (request) -> {
-		return request.toString();
-	};
+	public static final Function<AdvisedRequest, String> DEFAULT_REQUEST_TO_STRING = Record::toString;
 
-	public static final Function<ChatResponse, String> DEFAULT_RESPONSE_TO_STRING = (response) -> {
-		return ModelOptionsUtils.toJsonString(response);
-	};
+	public static final Function<ChatResponse, String> DEFAULT_RESPONSE_TO_STRING = ModelOptionsUtils::toJsonString;
 
 	private final Function<AdvisedRequest, String> requestToString;
 

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationContext.java

@@ -1,5 +1,5 @@
 /*
-* Copyright 2024 - 2024 the original author or authors.
+* Copyright 2024 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.
@@ -13,19 +13,22 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package org.springframework.ai.chat.client.advisor.observation;
 
 import java.util.Map;
 
 import org.springframework.ai.chat.client.AdvisedRequest;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 import io.micrometer.observation.Observation;
 
 /**
  * @author Christian Tzolov
+ * @author Soby Chacko
  * @since 1.0.0
  */
 
@@ -37,36 +40,43 @@ public enum Type {
 
 	}
 
+	@Nullable
 	private String advisorName;
 
+	@Nullable
 	private Type advisorType;
 
 	/**
 	 * The {@link AdvisedRequest} data to be advised. Represents the row
 	 * {@link ChatClient.ChatClientRequestSpec} data before sealed into a {@link Prompt}.
 	 */
+	@Nullable
 	private AdvisedRequest advisorRequest;
 
 	/**
 	 * The shared data between the advisors in the chain. It is shared between all request
 	 * and response advising points of all advisors in the chain.
 	 */
+	@Nullable
 	private Map<String, Object> advisorRequestContext;
 
 	/**
 	 * the shared data between the advisors in the chain. It is shared between all request
 	 * and response advising points of all advisors in the chain.
 	 */
+	@Nullable
 	private Map<String, Object> advisorResponseContext;
 
 	public void setAdvisorName(String advisorName) {
 		this.advisorName = advisorName;
 	}
 
+	@Nullable
 	public String getAdvisorName() {
 		return this.advisorName;
 	}
 
+	@Nullable
 	public Type getAdvisorType() {
 		return this.advisorType;
 	}
@@ -75,6 +85,7 @@ public void setAdvisorType(Type type) {
 		this.advisorType = type;
 	}
 
+	@Nullable
 	public AdvisedRequest getAdvisedRequest() {
 		return this.advisorRequest;
 	}
@@ -83,6 +94,7 @@ public void setAdvisedRequest(AdvisedRequest advisedRequest) {
 		this.advisorRequest = advisedRequest;
 	}
 
+	@Nullable
 	public Map<String, Object> getAdvisorRequestContext() {
 		return this.advisorRequestContext;
 	}
@@ -91,6 +103,7 @@ public void setAdvisorRequestContext(Map<String, Object> advisorRequestContext)
 		this.advisorRequestContext = advisorRequestContext;
 	}
 
+	@Nullable
 	public Map<String, Object> getAdvisorResponseContext() {
 		return this.advisorResponseContext;
 	}

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/AdvisorObservationDocumentation.java

@@ -1,5 +1,5 @@
 /*
-* Copyright 2024 - 2024 the original author or authors.
+* Copyright 2024 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.
@@ -13,6 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 package org.springframework.ai.chat.client.advisor.observation;
 
 import io.micrometer.common.docs.KeyName;

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/DefaultAdvisorObservationConvention.java

@@ -93,8 +93,8 @@ public KeyValues getHighCardinalityKeyValues(AdvisorObservationContext context)
 		return KeyValues.of(advisorName(context));
 	}
 
-	protected KeyValue advisorName(AdvisorObservationContext context) {
-		if (context.getAdvisorType() != null) {
+	protected KeyValue advisorName(@Nullable AdvisorObservationContext context) {
+		if (context != null && context.getAdvisorType() != null) {
 			return KeyValue.of(HighCardinalityKeyNames.ADVISOR_NAME, context.getAdvisorName());
 		}
 		return ADVISOR_NAME_NONE;

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/ObservableRequestResponseAdvisor.java

@@ -38,6 +38,7 @@ public class ObservableRequestResponseAdvisor implements RequestResponseAdvisor
 
 	private final ObservationRegistry observationRegistry;
 
+	@Nullable
 	private final AdvisorObservationConvention customObservationConvention;
 
 	public ObservableRequestResponseAdvisor(RequestResponseAdvisor targetAdvisor,

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/observation/package-info.java

@@ -0,0 +1,9 @@
+/**
+ * Package for chat client advisor observability components.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.ai.chat.client.advisor.observation;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/package-info.java

@@ -0,0 +1,9 @@
+/**
+ * Package containing chat client advisor components.
+ */
+@NonNullApi
+@NonNullFields
+package org.springframework.ai.chat.client.advisor;
+
+import org.springframework.lang.NonNullApi;
+import org.springframework.lang.NonNullFields;

spring-ai-core/src/main/java/org/springframework/ai/chat/client/observation/ChatClientInputContentObservationFilter.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.chat.client.observation;
 
 import java.util.stream.Collectors;