Nullability annotations change

Author: serge-rider

src/main/java/org/jkiss/tools/rcplaunchconfig/Params.java

@@ -16,7 +16,7 @@
  */
 package org.jkiss.tools.rcplaunchconfig;
 
-import jakarta.annotation.Nonnull;
+import org.jkiss.code.NotNull;
 import picocli.CommandLine;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParseResult;
@@ -53,7 +53,7 @@ public class Params {
     public boolean debug;
 
 
-    public @Nonnull ParseResult init(String[] args) {
+    public @NotNull ParseResult init(String[] args) {
         return new CommandLine(this)
             .parseArgs(args);
     }

src/main/java/org/jkiss/tools/rcplaunchconfig/producers/ConfigIniProducer.java

@@ -22,8 +22,8 @@
 import com.dbeaver.osgi.dependency.processing.p2.P2RepositoryManager;
 import com.dbeaver.osgi.dependency.processing.p2.repository.RemoteP2BundleInfo;
 import com.dbeaver.osgi.dependency.processing.util.FileUtils;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.tools.rcplaunchconfig.Params;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@ public class ConfigIniProducer {
 
     public static Map<String, String> generateConfigIni(
         @Nullable Path osgiSplashPath,
-        @Nonnull Collection<Set<BundleInfo>> bundles
+        @NotNull Collection<Set<BundleInfo>> bundles
     ) throws IOException {
         Map<String, String> result = new LinkedHashMap<>();
         if (osgiSplashPath != null) {
@@ -58,15 +58,15 @@ public static Map<String, String> generateConfigIni(
         return result;
     }
 
-    private static @Nonnull String getOsgiBundlesValue(@Nonnull Collection<Set<BundleInfo>> bundles) {
+    private static @NotNull String getOsgiBundlesValue(@NotNull Collection<Set<BundleInfo>> bundles) {
         return bundles.stream()
             .flatMap(Collection::stream)
             .filter(it -> it.getPath() != null)
             .map(ConfigIniProducer::getBundleReference)
             .collect(Collectors.joining(","));
     }
 
-    private static @Nonnull String getBundleReference(@Nonnull BundleInfo bundleInfo) {
+    private static @NotNull String getBundleReference(@NotNull BundleInfo bundleInfo) {
         var stringBuilder = new StringBuilder();
         stringBuilder.append("reference:");
         stringBuilder.append(getNormalizeFileReference(bundleInfo.getPath()));
@@ -78,15 +78,15 @@ public static Map<String, String> generateConfigIni(
         return stringBuilder.toString();
     }
 
-    private static @Nonnull String getBundleStartLevel(@Nonnull BundleInfo bundleInfo) {
+    private static @NotNull String getBundleStartLevel(@NotNull BundleInfo bundleInfo) {
         if (bundleInfo.getStartLevel() != null) {
             return "@" + bundleInfo.getStartLevel() + ":start";
         } else {
             return "@default:default";
         }
     }
 
-    private static @Nonnull String getOsgiFrameworkValue() throws IOException {
+    private static @NotNull String getOsgiFrameworkValue() throws IOException {
         var eclipsePluginsPath = PathsManager.INSTANCE.getEclipsePluginsPath();
         var file = FileUtils.findFirstChildByPackageName(eclipsePluginsPath, OSGI_FRAMEWORK_BUNDLE_NAME);
         if (file == null) {
@@ -109,11 +109,11 @@ public static Map<String, String> generateConfigIni(
         return file.getCanonicalPath();
     }
 
-    private static @Nonnull String getNormalizeFileReference(@Nonnull Path path) {
+    private static @NotNull String getNormalizeFileReference(@NotNull Path path) {
         return getNormalizeFileReference(path.toString());
     }
 
-    private static @Nonnull String getNormalizeFileReference(@Nonnull String path) {
+    private static @NotNull String getNormalizeFileReference(@NotNull String path) {
         return "file:" + path.replace('\\', '/');
     }
 

src/main/java/org/jkiss/tools/rcplaunchconfig/producers/DevPropertiesProducer.java

@@ -18,7 +18,7 @@
 
 import com.dbeaver.osgi.dependency.processing.BundleInfo;
 import com.dbeaver.osgi.dependency.processing.util.BundleValidator;
-import jakarta.annotation.Nonnull;
+import org.jkiss.code.NotNull;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -28,7 +28,7 @@ public class DevPropertiesProducer {
 
     private static final String DEFAULT_CLASSPATH = "target/classes";
 
-    public static @Nonnull Map<String, String> generateDevProperties(@Nonnull Collection<Set<BundleInfo>> bundles) {
+    public static @NotNull Map<String, String> generateDevProperties(@NotNull Collection<Set<BundleInfo>> bundles) {
         Map<String, String> result = new LinkedHashMap<>();
         for (var bundleInfos : bundles) {
             for (BundleInfo bundleInfo : bundleInfos) {
@@ -41,11 +41,11 @@ public class DevPropertiesProducer {
         return result;
     }
 
-    public static boolean isBundleAcceptable(@Nonnull String bundleName) {
+    public static boolean isBundleAcceptable(@NotNull String bundleName) {
         return BundleValidator.isInternalBundle(bundleName);
     }
 
-    private static @Nonnull String generateValue(@Nonnull List<String> bundleClassPath) {
+    private static @NotNull String generateValue(@NotNull List<String> bundleClassPath) {
         return Stream.concat(Stream.of(DEFAULT_CLASSPATH), bundleClassPath.stream())
             .collect(Collectors.joining(","));
     }