opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace jetbrains NotNull/Nullable annotations with jakarta (#19029)

Browse Source 
* Configure forbiddenapis for jetbrains annotations

* replace jetbrains NotNull/Nullable annotations with jakarta

* Update pom.xml

Co-authored-by: Othello Maurer <othello@graylog.com>

* Revert "replace jetbrains NotNull/Nullable annotations with jakarta"

This reverts commit 11d8b394d5.

* Replace org.jetbrains.annotations.NotNull with jakarta.annotations.Nonnull

* Replace org.jetbrains.annotations.Nullable with jakarta.annotations.Nullable

* removed unused import

---------

Co-authored-by: Othello Maurer <othello@graylog.com>
This commit is contained in:
Tomas Dvorak
2024-04-18 11:42:17 +02:00
committed by GitHub
parent cdc901bc99
commit c6040e2cab
35 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data-node/src/main/java/org/graylog/datanode/configuration/DatanodeDirectories.java
View File

@@ -18,7 +18,7 @@ package org.graylog.datanode.configuration;
import org.graylog.datanode.Configuration;
import org.graylog2.plugin.system.NodeId;
import org.jetbrains.annotations.NotNull;
import jakarta.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,8 +72,8 @@ public class DatanodeDirectories {
* TODO: Remove in 6.0 release
*/
@Deprecated(forRemoval = true)
@NotNull
protected static Path backwardsCompatible(@NotNull Path path, NodeId nodeId, String configProperty) {
@Nonnull
protected static Path backwardsCompatible(@Nonnull Path path, NodeId nodeId, String configProperty) {
final Path nodeIdSubdir = path.resolve(nodeId.getNodeId());
if(Files.exists(nodeIdSubdir) && Files.isDirectory(nodeIdSubdir)) {
LOG.warn("Caution, this datanode instance uses old format of directories. Please configure {} to point directly to {}", configProperty, nodeIdSubdir.toAbsolutePath());
@@ -132,7 +132,7 @@ public class DatanodeDirectories {
return createRestrictedAccessFile(resolvedPath);
}
@NotNull
@Nonnull
private static Path createRestrictedAccessFile(Path resolvedPath) throws IOException {
Files.deleteIfExists(resolvedPath);
final Set<PosixFilePermission> permissions = Set.of(PosixFilePermission.OWNER_WRITE, PosixFilePermission.OWNER_READ);

4
data-node/src/main/java/org/graylog/datanode/initializers/JerseyService.java
View File

@@ -58,7 +58,7 @@ import org.graylog2.rest.MoreMediaTypes;
import org.graylog2.shared.rest.exceptionmappers.JacksonPropertyExceptionMapper;
import org.graylog2.shared.rest.exceptionmappers.JsonProcessingExceptionMapper;
import org.graylog2.shared.security.tls.KeyStoreUtils;
import org.jetbrains.annotations.NotNull;
import jakarta.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -264,7 +264,7 @@ public class JerseyService extends AbstractIdleService {
return httpServer;
}
@NotNull
@Nonnull
private ContainerRequestFilter createAuthFilter(Configuration configuration) {
final ContainerRequestFilter basicAuthFilter = new BasicAuthFilter(configuration.getRootUsername(), configuration.getRootPasswordSha2(), "Datanode");
final AuthTokenValidator tokenVerifier = new JwtTokenValidator(configuration.getPasswordSecret());

4
data-node/src/main/java/org/graylog/datanode/periodicals/MetricsCollector.java
View File

@@ -38,7 +38,7 @@ import org.graylog.shaded.opensearch2.org.opensearch.search.builder.SearchSource
import org.graylog.shaded.opensearch2.org.opensearch.search.sort.SortBuilders;
import org.graylog.shaded.opensearch2.org.opensearch.search.sort.SortOrder;
import org.graylog2.plugin.periodical.Periodical;
import org.jetbrains.annotations.NotNull;
import jakarta.annotation.Nonnull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,7 +98,7 @@ public class MetricsCollector extends Periodical {
return 60;
}
@NotNull
@Nonnull
@Override
protected Logger getLogger() {
return LOG;