diff --git a/CHANGELOG.md b/CHANGELOG.md index d2071ecd3..92f926408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +## [0.6.0] - 2023-08-08 + +### Changed + +- Javax annotations replaced in favor of Jakarta annotations. + ## [0.5.0] - 2023-07-26 ### Added diff --git a/components/abstractions/build.gradle b/components/abstractions/build.gradle index ed0f13118..021a68e6d 100644 --- a/components/abstractions/build.gradle +++ b/components/abstractions/build.gradle @@ -1,7 +1,6 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'java' id 'eclipse' id 'maven-publish' id 'signing' diff --git a/components/abstractions/gradle/dependencies.gradle b/components/abstractions/gradle/dependencies.gradle index 3886c46e3..5ae6989b4 100644 --- a/components/abstractions/gradle/dependencies.gradle +++ b/components/abstractions/gradle/dependencies.gradle @@ -10,7 +10,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' implementation 'org.javatuples:javatuples:1.2' - implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'io.opentelemetry:opentelemetry-api:1.29.0' implementation 'io.opentelemetry:opentelemetry-context:1.29.0' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' } \ No newline at end of file diff --git a/components/abstractions/spotBugsExcludeFilter.xml b/components/abstractions/spotBugsExcludeFilter.xml index bfe85928b..81100f1d8 100644 --- a/components/abstractions/spotBugsExcludeFilter.xml +++ b/components/abstractions/spotBugsExcludeFilter.xml @@ -7,4 +7,12 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu + + + + + + + + \ No newline at end of file diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/ApiClientBuilder.java b/components/abstractions/src/main/java/com/microsoft/kiota/ApiClientBuilder.java index 808fa4a32..79891c743 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/ApiClientBuilder.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/ApiClientBuilder.java @@ -13,7 +13,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Provides a builder for creating an ApiClient and register the default serializers/deserializers. */ public class ApiClientBuilder { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/ApiException.java b/components/abstractions/src/main/java/com/microsoft/kiota/ApiException.java index 2f1978b53..45e4b29ff 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/ApiException.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/ApiException.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Parent type for exceptions thrown by the client when receiving failed responses to its requests. */ public class ApiException extends Exception { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestBuilder.java b/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestBuilder.java index f0ac661b2..8be237f6f 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestBuilder.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestBuilder.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Base class for request builders */ public abstract class BaseRequestBuilder { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestConfiguration.java b/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestConfiguration.java index 099a4e143..2a9bf403f 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestConfiguration.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestConfiguration.java @@ -2,7 +2,7 @@ import java.util.Collections; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** Base class for request configuration */ public abstract class BaseRequestConfiguration { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/CaseInsensitiveMap.java b/components/abstractions/src/main/java/com/microsoft/kiota/CaseInsensitiveMap.java index 952f668b4..cfb113aba 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/CaseInsensitiveMap.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/CaseInsensitiveMap.java @@ -10,8 +10,8 @@ import java.util.Objects; import java.util.Set; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; class CaseInsensitiveMap implements Map>{ private final HashMap> internalMap = new HashMap<>(); diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/Headers.java b/components/abstractions/src/main/java/com/microsoft/kiota/Headers.java index 6a27bdc51..8be7e6a74 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/Headers.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/Headers.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Set; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; class Headers extends CaseInsensitiveMap { /** Default constructor */ diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/MultipartBody.java b/components/abstractions/src/main/java/com/microsoft/kiota/MultipartBody.java index 984c8eaae..487f93b77 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/MultipartBody.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/MultipartBody.java @@ -12,8 +12,8 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.google.common.base.Strings; import com.microsoft.kiota.serialization.Parsable; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/NativeResponseHandler.java b/components/abstractions/src/main/java/com/microsoft/kiota/NativeResponseHandler.java index ac7de2e11..76056e543 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/NativeResponseHandler.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/NativeResponseHandler.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.serialization.Parsable; import com.microsoft.kiota.serialization.ParsableFactory; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/PeriodAndDuration.java b/components/abstractions/src/main/java/com/microsoft/kiota/PeriodAndDuration.java index 40923c4ec..00d76e322 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/PeriodAndDuration.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/PeriodAndDuration.java @@ -1,7 +1,6 @@ package com.microsoft.kiota; -import javax.annotation.Nonnull; -import javax.annotation.concurrent.Immutable; +import jakarta.annotation.Nonnull; import java.io.Serializable; import java.time.Duration; import java.time.Period; @@ -28,7 +27,6 @@ /** * The aggregate type for {@code Period} and {@code Duration } */ -@Immutable public final class PeriodAndDuration implements TemporalAmount, Comparable, Serializable { /** diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/RequestAdapter.java b/components/abstractions/src/main/java/com/microsoft/kiota/RequestAdapter.java index b4dd7af63..6bce04eb0 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/RequestAdapter.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/RequestAdapter.java @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.serialization.Parsable; import com.microsoft.kiota.serialization.ParsableFactory; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/RequestHeaders.java b/components/abstractions/src/main/java/com/microsoft/kiota/RequestHeaders.java index 4bea13aa8..5ff1b775a 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/RequestHeaders.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/RequestHeaders.java @@ -1,6 +1,6 @@ package com.microsoft.kiota; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * A class representing the headers of a request. diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/RequestInformation.java b/components/abstractions/src/main/java/com/microsoft/kiota/RequestInformation.java index 730af0c85..333d04a22 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/RequestInformation.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/RequestInformation.java @@ -20,8 +20,8 @@ import java.time.OffsetDateTime; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.serialization.Parsable; import com.microsoft.kiota.serialization.SerializationWriter; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/RequestOption.java b/components/abstractions/src/main/java/com/microsoft/kiota/RequestOption.java index 1bbb8c293..15c320699 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/RequestOption.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/RequestOption.java @@ -1,6 +1,6 @@ package com.microsoft.kiota; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Represents a request option. */ public interface RequestOption { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandler.java b/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandler.java index 044ff677f..532840621 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandler.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandler.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.serialization.Parsable; import com.microsoft.kiota.serialization.ParsableFactory; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandlerOption.java b/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandlerOption.java index 6f44f2383..f83a0657e 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandlerOption.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHandlerOption.java @@ -1,7 +1,7 @@ package com.microsoft.kiota; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Request option that can be used to provide a callback and handle the raw response */ public class ResponseHandlerOption implements RequestOption { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHeaders.java b/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHeaders.java index dd82d864b..d7feba690 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHeaders.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/ResponseHeaders.java @@ -1,6 +1,6 @@ package com.microsoft.kiota; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * A class representing the headers of a request. diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AccessTokenProvider.java b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AccessTokenProvider.java index 996c8bc3b..2d5638199 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AccessTokenProvider.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AccessTokenProvider.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Returns access tokens */ public interface AccessTokenProvider { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AllowedHostsValidator.java b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AllowedHostsValidator.java index 7b6ffe532..c99b357e2 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AllowedHostsValidator.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AllowedHostsValidator.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.Set; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Maintains a list of valid hosts and allows authentication providers to check whether a host is valid before authenticating a request */ public class AllowedHostsValidator { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AnonymousAuthenticationProvider.java b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AnonymousAuthenticationProvider.java index 814c051f6..c9d8b08eb 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AnonymousAuthenticationProvider.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AnonymousAuthenticationProvider.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** This authentication provider does not perform any authentication. */ public class AnonymousAuthenticationProvider implements AuthenticationProvider { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/ApiKeyAuthenticationProvider.java b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/ApiKeyAuthenticationProvider.java index 3ee12a355..fcc45289e 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/ApiKeyAuthenticationProvider.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/ApiKeyAuthenticationProvider.java @@ -6,8 +6,8 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.RequestInformation; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AuthenticationProvider.java b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AuthenticationProvider.java index 9704cbab9..6e808ce76 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AuthenticationProvider.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/AuthenticationProvider.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Authenticates the application request. */ public interface AuthenticationProvider { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/BaseBearerTokenAuthenticationProvider.java b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/BaseBearerTokenAuthenticationProvider.java index 39d15a7e8..42390c133 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/authentication/BaseBearerTokenAuthenticationProvider.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/authentication/BaseBearerTokenAuthenticationProvider.java @@ -8,8 +8,8 @@ import java.util.Map; import java.util.Objects; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Provides a base class for implementing AuthenticationProvider for Bearer token scheme. */ public class BaseBearerTokenAuthenticationProvider implements AuthenticationProvider { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/AdditionalDataHolder.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/AdditionalDataHolder.java index bd2e839f5..2d6a47843 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/AdditionalDataHolder.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/AdditionalDataHolder.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Defines a contract for models that can hold additional data besides the described properties. */ public interface AdditionalDataHolder { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/Parsable.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/Parsable.java index 9016fb5ee..e2e4a1619 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/Parsable.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/Parsable.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.function.Consumer; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Defines a serializable model object. */ diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParsableFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParsableFactory.java index 44a42bd85..92d624e2e 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParsableFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParsableFactory.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.serialization; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Defines the factory for creating parsable objects. diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNode.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNode.java index 07353c2d6..808d23938 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNode.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNode.java @@ -12,8 +12,8 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Interface for a deserialization node in a parse tree. This interface provides an abstraction layer over serialization formats, libraries and implementations. diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactory.java index 628796a06..6f9d77a15 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactory.java @@ -2,7 +2,7 @@ import java.io.InputStream; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Defines the contract for a factory that is used to create {@link ParseNode}s. diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactoryRegistry.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactoryRegistry.java index 6499f7b98..82d784e12 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactoryRegistry.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeFactoryRegistry.java @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.regex.Pattern; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * This factory holds a list of all the registered factories for the various types of nodes. diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeHelper.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeHelper.java index d1e7ad459..e125a8127 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeHelper.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeHelper.java @@ -5,7 +5,7 @@ import java.util.Map.Entry; import java.util.function.Consumer; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Utility methods to reduce the amount of code being generated. */ public class ParseNodeHelper { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeProxyFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeProxyFactory.java index d5705356f..9119f22c0 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeProxyFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ParseNodeProxyFactory.java @@ -5,8 +5,8 @@ import java.io.InputStream; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Proxy factory that allows the composition of before and after callbacks on existing factories. */ public abstract class ParseNodeProxyFactory implements ParseNodeFactory { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriter.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriter.java index fa8a17efc..b32071d52 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriter.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriter.java @@ -15,8 +15,8 @@ import java.util.function.Consumer; import java.util.function.BiConsumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Defines an interface for serialization of objects to a stream. */ public interface SerializationWriter extends Closeable { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactory.java index 7931b8e99..4bd66921f 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactory.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.serialization; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Defines the contract for a factory that creates SerializationWriter instances. */ public interface SerializationWriterFactory { /** diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactoryRegistry.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactoryRegistry.java index 966747243..8d7bd89f8 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactoryRegistry.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterFactoryRegistry.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.regex.Pattern; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** This factory holds a list of all the registered factories for the various types of nodes. */ public class SerializationWriterFactoryRegistry implements SerializationWriterFactory { /** Default constructor for the registry. */ diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterProxyFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterProxyFactory.java index 7ea0b61dd..e0f08cef3 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterProxyFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/SerializationWriterProxyFactory.java @@ -4,8 +4,8 @@ import java.util.function.BiConsumer; import java.util.Objects; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Proxy factory that allows the composition of before and after callbacks on existing factories. */ public abstract class SerializationWriterProxyFactory implements SerializationWriterFactory { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ValuedEnum.java b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ValuedEnum.java index 5a7e03439..9a5029c61 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ValuedEnum.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/serialization/ValuedEnum.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.serialization; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** The interface for the valued enum. */ public interface ValuedEnum { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackedModel.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackedModel.java index ad51bf92a..0b8921077 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackedModel.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackedModel.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.store; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Defines the contracts for a model that is backed by a store. */ public interface BackedModel { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStore.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStore.java index 246b09b1c..669633457 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStore.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStore.java @@ -1,7 +1,7 @@ package com.microsoft.kiota.store; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.Map; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactory.java index 627f1ffd3..11600db63 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactory.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.store; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Defines the contract for a factory that creates backing stores. */ public interface BackingStoreFactory { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactorySingleton.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactorySingleton.java index 627423e6d..c2ba544d2 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactorySingleton.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreFactorySingleton.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.store; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** This class is used to register the backing store factory. */ public class BackingStoreFactorySingleton { diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreParseNodeFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreParseNodeFactory.java index b2081baa9..248464bd2 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreParseNodeFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreParseNodeFactory.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.store; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.microsoft.kiota.serialization.ParseNodeProxyFactory; import com.microsoft.kiota.serialization.ParseNodeFactory; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreSerializationWriterProxyFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreSerializationWriterProxyFactory.java index 8c88dc43b..e92d12db0 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreSerializationWriterProxyFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/BackingStoreSerializationWriterProxyFactory.java @@ -3,7 +3,7 @@ import com.microsoft.kiota.serialization.SerializationWriterFactory; import com.microsoft.kiota.serialization.SerializationWriterProxyFactory; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /**Proxy implementation of SerializationWriterFactory for the backing store that automatically sets the state of the backing store when serializing. */ public class BackingStoreSerializationWriterProxyFactory extends SerializationWriterProxyFactory { /** diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStore.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStore.java index 60b4735a4..3c7872f5d 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStore.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStore.java @@ -9,8 +9,8 @@ import java.util.Objects; import java.util.UUID; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.TriConsumer; diff --git a/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStoreFactory.java b/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStoreFactory.java index fbd204941..7a0164184 100644 --- a/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStoreFactory.java +++ b/components/abstractions/src/main/java/com/microsoft/kiota/store/InMemoryBackingStoreFactory.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.store; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** This class is used to create instances of InMemoryBackingStore */ public class InMemoryBackingStoreFactory implements BackingStoreFactory { diff --git a/components/abstractions/src/test/java/com/microsoft/kiota/RequestInformationTest.java b/components/abstractions/src/test/java/com/microsoft/kiota/RequestInformationTest.java index 1112e5c6f..8182fa448 100644 --- a/components/abstractions/src/test/java/com/microsoft/kiota/RequestInformationTest.java +++ b/components/abstractions/src/test/java/com/microsoft/kiota/RequestInformationTest.java @@ -238,10 +238,10 @@ class GetQueryParameters { /// Select properties to be returned\ @QueryParameter(name ="%24select") - @javax.annotation.Nullable + @jakarta.annotation.Nullable public String[] select; /// Search items by search phrases @QueryParameter(name ="%24search") - @javax.annotation.Nullable + @jakarta.annotation.Nullable public String search; } \ No newline at end of file diff --git a/components/abstractions/src/test/java/com/microsoft/kiota/TestEntity.java b/components/abstractions/src/test/java/com/microsoft/kiota/TestEntity.java index dec6bec64..a274ea8b9 100644 --- a/components/abstractions/src/test/java/com/microsoft/kiota/TestEntity.java +++ b/components/abstractions/src/test/java/com/microsoft/kiota/TestEntity.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.function.Consumer; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.microsoft.kiota.serialization.Parsable; import com.microsoft.kiota.serialization.ParseNode; diff --git a/components/authentication/azure/build.gradle b/components/authentication/azure/build.gradle index 637c63bc4..48505f756 100644 --- a/components/authentication/azure/build.gradle +++ b/components/authentication/azure/build.gradle @@ -1,7 +1,6 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'java' id 'eclipse' id 'maven-publish' id 'signing' diff --git a/components/authentication/azure/gradle/dependencies.gradle b/components/authentication/azure/gradle/dependencies.gradle index f818143ec..930967f18 100644 --- a/components/authentication/azure/gradle/dependencies.gradle +++ b/components/authentication/azure/gradle/dependencies.gradle @@ -11,6 +11,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-api:1.29.0' implementation 'io.opentelemetry:opentelemetry-context:1.29.0' implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api 'com.azure:azure-core:1.42.0' api project(':components:abstractions') diff --git a/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProvider.java b/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProvider.java index 656b9d30b..4c176bcf9 100644 --- a/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProvider.java +++ b/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAccessTokenProvider.java @@ -10,8 +10,8 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.azure.core.credential.TokenCredential; import com.azure.core.credential.TokenRequestContext; diff --git a/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAuthenticationProvider.java b/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAuthenticationProvider.java index 7e1be64d8..df1d24d70 100644 --- a/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAuthenticationProvider.java +++ b/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/AzureIdentityAuthenticationProvider.java @@ -1,7 +1,7 @@ package com.microsoft.kiota.authentication; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.azure.core.credential.TokenCredential; import com.microsoft.kiota.authentication.BaseBearerTokenAuthenticationProvider; diff --git a/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/ObservabilityOptions.java b/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/ObservabilityOptions.java index 7a6b1e5b5..13a83bdb6 100644 --- a/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/ObservabilityOptions.java +++ b/components/authentication/azure/src/main/java/com/microsoft/kiota/authentication/ObservabilityOptions.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.authentication; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Holds the tracing, metrics and logging configuration for the authentication provider adapter */ public class ObservabilityOptions { diff --git a/components/http/okHttp/build.gradle b/components/http/okHttp/build.gradle index 08d1fd73e..99eeaa89e 100644 --- a/components/http/okHttp/build.gradle +++ b/components/http/okHttp/build.gradle @@ -1,7 +1,6 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'java' id 'eclipse' id 'maven-publish' id 'signing' diff --git a/components/http/okHttp/gradle/dependencies.gradle b/components/http/okHttp/gradle/dependencies.gradle index 7ea379552..3e1ed53fd 100644 --- a/components/http/okHttp/gradle/dependencies.gradle +++ b/components/http/okHttp/gradle/dependencies.gradle @@ -13,6 +13,7 @@ dependencies { implementation 'io.opentelemetry:opentelemetry-context:1.29.0' implementation 'io.opentelemetry:opentelemetry-semconv:1.29.0-alpha' implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api 'com.squareup.okhttp3:okhttp:4.11.0' api project(':components:abstractions') diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/KiotaClientFactory.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/KiotaClientFactory.java index 2aab42e21..9517ddf60 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/KiotaClientFactory.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/KiotaClientFactory.java @@ -1,7 +1,7 @@ package com.microsoft.kiota.http; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.time.Duration; import com.microsoft.kiota.http.middleware.RedirectHandler; import com.microsoft.kiota.http.middleware.RetryHandler; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/ObservabilityOptions.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/ObservabilityOptions.java index 054a95725..d481fc2b0 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/ObservabilityOptions.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/ObservabilityOptions.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.http; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.microsoft.kiota.RequestOption; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java index c3d012d57..b2e611b06 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java @@ -22,8 +22,8 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.ApiClientBuilder; import com.microsoft.kiota.ApiException; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ChaosHandler.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ChaosHandler.java index ea4bb9374..0b44649df 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ChaosHandler.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ChaosHandler.java @@ -3,7 +3,7 @@ import java.io.IOException; import java.util.concurrent.ThreadLocalRandom; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import okhttp3.Interceptor; import okhttp3.MediaType; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ObservabilityHelper.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ObservabilityHelper.java index e94dc3352..0ad5f014d 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ObservabilityHelper.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ObservabilityHelper.java @@ -2,8 +2,8 @@ import java.util.Objects; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.http.ObservabilityOptions; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ParametersNameDecodingHandler.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ParametersNameDecodingHandler.java index 30f411991..5c78b16be 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ParametersNameDecodingHandler.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/ParametersNameDecodingHandler.java @@ -6,8 +6,8 @@ import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.http.middleware.options.ParametersNameDecodingOption; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RedirectHandler.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RedirectHandler.java index d96e644c4..bbc80b695 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RedirectHandler.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RedirectHandler.java @@ -10,8 +10,8 @@ import java.net.ProtocolException; import java.util.Objects; -import javax.annotation.Nullable; -import javax.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.annotation.Nonnull; import com.microsoft.kiota.http.middleware.options.RedirectHandlerOption; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RetryHandler.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RetryHandler.java index 9ef193c91..0ae470719 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RetryHandler.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/RetryHandler.java @@ -7,8 +7,8 @@ import java.time.temporal.ChronoUnit; import java.util.Objects; -import javax.annotation.Nullable; -import javax.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.annotation.Nonnull; import com.microsoft.kiota.http.middleware.options.IShouldRetry; import com.microsoft.kiota.http.middleware.options.RetryHandlerOption; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/TelemetryHandler.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/TelemetryHandler.java index 54ba08bb8..ddbbf2968 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/TelemetryHandler.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/TelemetryHandler.java @@ -4,8 +4,8 @@ import java.util.Objects; import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.http.middleware.options.TelemetryHandlerOption; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UrlReplaceHandler.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UrlReplaceHandler.java index 5136ccb9f..7854d0172 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UrlReplaceHandler.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UrlReplaceHandler.java @@ -7,7 +7,7 @@ import okhttp3.Request; import okhttp3.Response; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UserAgentHandler.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UserAgentHandler.java index 494444bb0..6b137d107 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UserAgentHandler.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/UserAgentHandler.java @@ -3,8 +3,8 @@ import java.io.IOException; import java.util.Objects; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.http.middleware.options.UserAgentHandlerOption; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRedirect.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRedirect.java index e078e676b..022aa9b1b 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRedirect.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRedirect.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.http.middleware.options; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import okhttp3.Response; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRetry.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRetry.java index 3770725ee..f31d48b85 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRetry.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/IShouldRetry.java @@ -3,7 +3,7 @@ import okhttp3.Request; import okhttp3.Response; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Indicates whether a specific request should be retried diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/ParametersNameDecodingOption.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/ParametersNameDecodingOption.java index 143276f46..a232dd45b 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/ParametersNameDecodingOption.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/ParametersNameDecodingOption.java @@ -1,6 +1,6 @@ package com.microsoft.kiota.http.middleware.options; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.microsoft.kiota.RequestOption; /** The ParametersEncodingOption request class */ diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RedirectHandlerOption.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RedirectHandlerOption.java index 2f95fab68..77f732fa8 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RedirectHandlerOption.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RedirectHandlerOption.java @@ -1,10 +1,10 @@ package com.microsoft.kiota.http.middleware.options; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import com.microsoft.kiota.RequestOption; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Options to be passed to the redirect middleware. diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RetryHandlerOption.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RetryHandlerOption.java index 086ea02a2..4692108fc 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RetryHandlerOption.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/RetryHandlerOption.java @@ -1,10 +1,10 @@ package com.microsoft.kiota.http.middleware.options; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import com.microsoft.kiota.RequestOption; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * The options to be passed to the retry middleware. diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/TelemetryHandlerOption.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/TelemetryHandlerOption.java index b4cd4b31e..dcc7dadb9 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/TelemetryHandlerOption.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/TelemetryHandlerOption.java @@ -2,8 +2,8 @@ import java.util.function.Function; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.microsoft.kiota.RequestOption; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UrlReplaceHandlerOption.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UrlReplaceHandlerOption.java index 0dc53b85c..9d715408e 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UrlReplaceHandlerOption.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UrlReplaceHandlerOption.java @@ -2,7 +2,7 @@ import com.microsoft.kiota.RequestOption; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java index 9f0163ea9..a9e49801b 100644 --- a/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java +++ b/components/http/okHttp/src/main/java/com/microsoft/kiota/http/middleware/options/UserAgentHandlerOption.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import com.microsoft.kiota.RequestOption; @@ -14,7 +14,7 @@ public UserAgentHandlerOption() { } @Nonnull private String productName = "kiota-java"; @Nonnull - private String productVersion = "0.5.0"; + private String productVersion = "0.6.0"; /** * Gets the product name to be used in the user agent header * @return the product name diff --git a/components/serialization/form/build.gradle b/components/serialization/form/build.gradle index 19ff4864a..9df117983 100644 --- a/components/serialization/form/build.gradle +++ b/components/serialization/form/build.gradle @@ -1,7 +1,6 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'java' id 'eclipse' id 'maven-publish' id 'signing' diff --git a/components/serialization/form/gradle/dependencies.gradle b/components/serialization/form/gradle/dependencies.gradle index d2c0793ee..8509d0bad 100644 --- a/components/serialization/form/gradle/dependencies.gradle +++ b/components/serialization/form/gradle/dependencies.gradle @@ -7,6 +7,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api project(':components:abstractions') } diff --git a/components/serialization/form/spotBugsExcludeFilter.xml b/components/serialization/form/spotBugsExcludeFilter.xml index d9952e56b..06b696d2f 100644 --- a/components/serialization/form/spotBugsExcludeFilter.xml +++ b/components/serialization/form/spotBugsExcludeFilter.xml @@ -12,4 +12,8 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu + + + + \ No newline at end of file diff --git a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNode.java b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNode.java index a721b88fb..9ca000c34 100644 --- a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNode.java +++ b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNode.java @@ -24,8 +24,8 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** ParseNode implementation for URI form encoded payloads */ public class FormParseNode implements ParseNode { diff --git a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNodeFactory.java b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNodeFactory.java index 89f050319..b04c8600a 100644 --- a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNodeFactory.java +++ b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNodeFactory.java @@ -8,7 +8,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Creates instances of Form Parse Nodes */ public class FormParseNodeFactory implements ParseNodeFactory { diff --git a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriter.java b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriter.java index d7a7dd106..3a8430fd4 100644 --- a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriter.java +++ b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriter.java @@ -28,8 +28,8 @@ import java.util.stream.Stream; import java.util.function.BiConsumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Serialization writer implementation for URI form encoded payloads */ public class FormSerializationWriter implements SerializationWriter { diff --git a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriterFactory.java b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriterFactory.java index 7473b9596..f2c8fd32c 100644 --- a/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriterFactory.java +++ b/components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormSerializationWriterFactory.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Creates instances of Form Serialization Writers */ public class FormSerializationWriterFactory implements SerializationWriterFactory { diff --git a/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java b/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java index 71793aa62..30e405d53 100644 --- a/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java +++ b/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java @@ -63,8 +63,8 @@ public Long getFailureRate() { public void setFailureRate(Long value) { this._failureRate = value; } - @javax.annotation.Nonnull - public static SecondTestEntity createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static SecondTestEntity createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { return new SecondTestEntity(); } } diff --git a/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java b/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java index e2eefbc07..bea48bd3e 100644 --- a/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java +++ b/components/serialization/form/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java @@ -55,7 +55,7 @@ public PeriodAndDuration getWorkDuration() { } public void setWorkDuration(PeriodAndDuration value) { - this._workDuration = value; + this._workDuration = PeriodAndDuration.of(value.getPeriod(), value.getDuration()); } private LocalTime _startWorkTime; @@ -137,8 +137,8 @@ public void serialize(SerializationWriter writer) { public Map getAdditionalData() { return _additionalData; } - @javax.annotation.Nonnull - public static TestEntity createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static TestEntity createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { return new TestEntity(); } } diff --git a/components/serialization/json/build.gradle b/components/serialization/json/build.gradle index e7d625cce..c6e1d2108 100644 --- a/components/serialization/json/build.gradle +++ b/components/serialization/json/build.gradle @@ -1,7 +1,6 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'java' id 'eclipse' id 'maven-publish' id 'signing' diff --git a/components/serialization/json/gradle/dependencies.gradle b/components/serialization/json/gradle/dependencies.gradle index 4a239ba94..c443d0d66 100644 --- a/components/serialization/json/gradle/dependencies.gradle +++ b/components/serialization/json/gradle/dependencies.gradle @@ -7,6 +7,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api 'com.google.code.gson:gson:2.10.1' api project(':components:abstractions') diff --git a/components/serialization/json/spotBugsExcludeFilter.xml b/components/serialization/json/spotBugsExcludeFilter.xml index 315c8fe27..62bdde362 100644 --- a/components/serialization/json/spotBugsExcludeFilter.xml +++ b/components/serialization/json/spotBugsExcludeFilter.xml @@ -26,4 +26,8 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu + + + + \ No newline at end of file diff --git a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNode.java b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNode.java index 33210ab07..91fcfca6a 100644 --- a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNode.java +++ b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNode.java @@ -21,8 +21,8 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** ParseNode implementation for JSON */ public class JsonParseNode implements ParseNode { diff --git a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNodeFactory.java b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNodeFactory.java index cfa4766ed..2348c759c 100644 --- a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNodeFactory.java +++ b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNodeFactory.java @@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Creates new Json parse nodes from the payload. */ public class JsonParseNodeFactory implements ParseNodeFactory { diff --git a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriter.java b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriter.java index 17b2e6490..8f92616d7 100644 --- a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriter.java +++ b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriter.java @@ -27,8 +27,8 @@ import java.util.stream.Stream; import java.util.function.BiConsumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import com.google.gson.stream.JsonWriter; diff --git a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriterFactory.java b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriterFactory.java index a264fd210..9fc96f303 100644 --- a/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriterFactory.java +++ b/components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonSerializationWriterFactory.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Creates new Json serialization writers. */ public class JsonSerializationWriterFactory implements SerializationWriterFactory { diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/IntersectionTypeMock.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/IntersectionTypeMock.java index bc498091d..85d5d415b 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/IntersectionTypeMock.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/IntersectionTypeMock.java @@ -17,8 +17,8 @@ public class IntersectionTypeMock implements Parsable, ComposedTypeWrapper { private SecondTestEntity _composedType2; private String _stringValue; private java.util.List _composedType3; - @javax.annotation.Nonnull - public static IntersectionTypeMock createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static IntersectionTypeMock createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { Objects.requireNonNull(parseNode); final var result = new IntersectionTypeMock(); if (parseNode.getStringValue() != null) { diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java index 71793aa62..30e405d53 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java @@ -63,8 +63,8 @@ public Long getFailureRate() { public void setFailureRate(Long value) { this._failureRate = value; } - @javax.annotation.Nonnull - public static SecondTestEntity createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static SecondTestEntity createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { return new SecondTestEntity(); } } diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java index a6e57f682..e3397964e 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java @@ -49,7 +49,7 @@ public PeriodAndDuration getWorkDuration() { } public void setWorkDuration(PeriodAndDuration value) { - this._workDuration = value; + this._workDuration = PeriodAndDuration.of(value.getPeriod(), value.getDuration()); } private LocalTime _startWorkTime; @@ -127,8 +127,8 @@ public void serialize(SerializationWriter writer) { public Map getAdditionalData() { return _additionalData; } - @javax.annotation.Nonnull - public static TestEntity createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static TestEntity createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { return new TestEntity(); } } diff --git a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/UnionTypeMock.java b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/UnionTypeMock.java index ebcbd95e7..696fc7a96 100644 --- a/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/UnionTypeMock.java +++ b/components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/UnionTypeMock.java @@ -15,8 +15,8 @@ public class UnionTypeMock implements Parsable, ComposedTypeWrapper { private SecondTestEntity _composedType2; private String _stringValue; private java.util.List _composedType3; - @javax.annotation.Nonnull - public static UnionTypeMock createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static UnionTypeMock createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { Objects.requireNonNull(parseNode); final UnionTypeMock result = new UnionTypeMock(); final ParseNode mappingValueNode = parseNode.getChildNode("@odata.type"); diff --git a/components/serialization/multipart/build.gradle b/components/serialization/multipart/build.gradle index e7e91ba8d..55b84680c 100644 --- a/components/serialization/multipart/build.gradle +++ b/components/serialization/multipart/build.gradle @@ -1,7 +1,6 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'java' id 'eclipse' id 'maven-publish' id 'signing' diff --git a/components/serialization/multipart/gradle/dependencies.gradle b/components/serialization/multipart/gradle/dependencies.gradle index 6ef8cf374..16e971239 100644 --- a/components/serialization/multipart/gradle/dependencies.gradle +++ b/components/serialization/multipart/gradle/dependencies.gradle @@ -8,6 +8,7 @@ dependencies { // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api project(':components:abstractions') testImplementation project(':components:serialization:json') diff --git a/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriter.java b/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriter.java index 29e40e96f..bff4fbd9b 100644 --- a/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriter.java +++ b/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriter.java @@ -22,8 +22,8 @@ import java.util.stream.Stream; import java.util.function.BiConsumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Serialization writer implementation for Multipart encoded payloads */ public class MultipartSerializationWriter implements SerializationWriter { diff --git a/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriterFactory.java b/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriterFactory.java index 6411d1fcc..e8966ce4c 100644 --- a/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriterFactory.java +++ b/components/serialization/multipart/src/main/java/com/microsoft/kiota/serialization/MultipartSerializationWriterFactory.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Creates instances of Multipart Serialization Writers */ public class MultipartSerializationWriterFactory implements SerializationWriterFactory { diff --git a/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java b/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java index 71793aa62..30e405d53 100644 --- a/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java +++ b/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/SecondTestEntity.java @@ -63,8 +63,8 @@ public Long getFailureRate() { public void setFailureRate(Long value) { this._failureRate = value; } - @javax.annotation.Nonnull - public static SecondTestEntity createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static SecondTestEntity createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { return new SecondTestEntity(); } } diff --git a/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java b/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java index e2eefbc07..bea48bd3e 100644 --- a/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java +++ b/components/serialization/multipart/src/test/java/com/microsoft/kiota/serialization/mocks/TestEntity.java @@ -55,7 +55,7 @@ public PeriodAndDuration getWorkDuration() { } public void setWorkDuration(PeriodAndDuration value) { - this._workDuration = value; + this._workDuration = PeriodAndDuration.of(value.getPeriod(), value.getDuration()); } private LocalTime _startWorkTime; @@ -137,8 +137,8 @@ public void serialize(SerializationWriter writer) { public Map getAdditionalData() { return _additionalData; } - @javax.annotation.Nonnull - public static TestEntity createFromDiscriminatorValue(@javax.annotation.Nonnull final ParseNode parseNode) { + @jakarta.annotation.Nonnull + public static TestEntity createFromDiscriminatorValue(@jakarta.annotation.Nonnull final ParseNode parseNode) { return new TestEntity(); } } diff --git a/components/serialization/text/build.gradle b/components/serialization/text/build.gradle index aaa93fd7e..8d1d99223 100644 --- a/components/serialization/text/build.gradle +++ b/components/serialization/text/build.gradle @@ -1,7 +1,6 @@ plugins { // Apply the java-library plugin to add support for Java Library id 'java-library' - id 'java' id 'eclipse' id 'maven-publish' id 'signing' diff --git a/components/serialization/text/gradle/dependencies.gradle b/components/serialization/text/gradle/dependencies.gradle index f07b8c8dc..174403073 100644 --- a/components/serialization/text/gradle/dependencies.gradle +++ b/components/serialization/text/gradle/dependencies.gradle @@ -6,7 +6,8 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' // This dependency is used internally, and not exposed to consumers on their own compile classpath. - implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'com.google.guava:guava:32.1.2-jre' + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' api project(':components:abstractions') } diff --git a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNode.java b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNode.java index 91a54d2d8..7cdf821fd 100644 --- a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNode.java +++ b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNode.java @@ -15,8 +15,8 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** ParseNode implementation for text/plain */ public class TextParseNode implements ParseNode { diff --git a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNodeFactory.java b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNodeFactory.java index 0b32b7051..127bfbc2d 100644 --- a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNodeFactory.java +++ b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextParseNodeFactory.java @@ -8,7 +8,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Creates new text parse nodes */ public class TextParseNodeFactory implements ParseNodeFactory { diff --git a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriter.java b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriter.java index 6c3b08329..61d5076f1 100644 --- a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriter.java +++ b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriter.java @@ -22,8 +22,8 @@ import java.util.function.Consumer; import java.util.function.BiConsumer; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** Serialization writer implementation for text/plain */ public class TextSerializationWriter implements SerializationWriter { diff --git a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriterFactory.java b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriterFactory.java index 3cde21545..f109c45db 100644 --- a/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriterFactory.java +++ b/components/serialization/text/src/main/java/com/microsoft/kiota/serialization/TextSerializationWriterFactory.java @@ -2,7 +2,7 @@ import java.util.Objects; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** Creates new text serialization writers */ public class TextSerializationWriterFactory implements SerializationWriterFactory { diff --git a/gradle.properties b/gradle.properties index be6ba7aef..6969c564c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ org.gradle.caching=true mavenGroupId = com.microsoft.kiota mavenMajorVersion = 0 -mavenMinorVersion = 5 +mavenMinorVersion = 6 mavenPatchVersion = 0 mavenArtifactSuffix =