Merge pull request #553 from microsoft/jakarta_annotations

Jakarta Annotations

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

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'

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'
 }

components/abstractions/spotBugsExcludeFilter.xml

@@ -7,4 +7,12 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu
         <Class name="com.microsoft.kiota.UriTemplate$UriTemplateParser" />
         <Bug pattern="SF_SWITCH_FALLTHROUGH" />
     </Match>
+    <Match>
+        <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD" />
+        <Or>
+            <Class name="com.microsoft.kiota.BaseRequestBuilder" />
+            <Class name="com.microsoft.kiota.BaseRequestConfiguration" />
+            <Class name="com.microsoft.kiota.RequestInformation" />
+        </Or>
+    </Match>
 </FindBugsFilter>

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 {

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 {

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 {

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 {

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<String, Set<String>>{
     private final HashMap<String, HashSet<String>> internalMap = new HashMap<>();

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 */

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;

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;

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<PeriodAndDuration>, Serializable {
 
     /**

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;

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.

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;

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 {

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;

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 {

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.

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 {

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 {

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 {

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;
 

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 {

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 {

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 {

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.
  */

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.

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.

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.

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.

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 {

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 {

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 {

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 {
     /**

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. */

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 {

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 {