Skip to content

Commit

Permalink
Replace Jetbrains with Jakarta annotations (apache#482)
Browse files Browse the repository at this point in the history
`org.jetbrains.annotations.NotNull`/`Nullable` -> `jakarta.annotations.Nonnull`/`Nullable`
plus Guava's `VisibleForTesting`

The Jakarta annotations are likely better supported by validation frameworks like Hibernate Validator.
  • Loading branch information
snazy authored Nov 28, 2024
1 parent 4b24da5 commit 1868bbd
Show file tree
Hide file tree
Showing 80 changed files with 947 additions and 950 deletions.
2 changes: 1 addition & 1 deletion extension/persistence/eclipselink/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
}
}

compileOnly(libs.jetbrains.annotations)
compileOnly(libs.jakarta.annotation.api)

testImplementation(libs.h2)
testImplementation(testFixtures(project(":polaris-core")))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import jakarta.annotation.Nonnull;
import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreSession;
import org.jetbrains.annotations.NotNull;

/**
* The implementation of Configuration interface for configuring the {@link PolarisMetaStoreManager}
Expand All @@ -42,13 +42,13 @@ public class EclipseLinkPolarisMetaStoreManagerFactory
private String persistenceUnitName;

@Override
protected PolarisEclipseLinkStore createBackingStore(@NotNull PolarisDiagnostics diagnostics) {
protected PolarisEclipseLinkStore createBackingStore(@Nonnull PolarisDiagnostics diagnostics) {
return new PolarisEclipseLinkStore(diagnostics);
}

@Override
protected PolarisMetaStoreSession createMetaStoreSession(
@NotNull PolarisEclipseLinkStore store, @NotNull RealmContext realmContext) {
@Nonnull PolarisEclipseLinkStore store, @Nonnull RealmContext realmContext) {
return new PolarisEclipseLinkMetaStoreSessionImpl(
store,
storageIntegration,
Expand Down
Loading

0 comments on commit 1868bbd

Please sign in to comment.