Merge pull request #2851 from guwirth/td-25

fix technical debt
SonarOpenCommunity · Jan 14, 2025 · e47e270 · e47e270
2 parents 74e5db5 + 01558fd
commit e47e270
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/valgrind/ValgrindStack.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/valgrind/ValgrindStack.java
@@ -25,6 +25,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 
@@ -35,7 +36,7 @@ class ValgrindStack {
 
   private final List<ValgrindFrame> frames = new ArrayList<>();
 
-  private static boolean isInside(String path, String folder) {
+  private static boolean isInside(@Nullable String path, String folder) {
     return (path != null) && !path.isBlank() && path.startsWith(folder);
   }
 

diff --git a/cxx-squid-bridge/src/main/java/org/sonar/cxx/squidbridge/api/SourceCode.java b/cxx-squid-bridge/src/main/java/org/sonar/cxx/squidbridge/api/SourceCode.java
@@ -73,7 +73,7 @@ protected SourceCode(String key, @Nullable String name) {
     this.name = name;
   }
 
-  protected SourceCode(SourceCode parentKey, String key, @Nullable String name, int startAtLine) {
+  protected SourceCode(@Nullable SourceCode parentKey, String key, @Nullable String name, int startAtLine) {
     var sb = new StringBuilder();
     if (parentKey != null) {
       sb.append(parentKey.getKey()).append('@');

diff --git a/cxx-sslr/sslr-core/src/main/java/com/sonar/cxx/sslr/api/AstNode.java b/cxx-sslr/sslr-core/src/main/java/com/sonar/cxx/sslr/api/AstNode.java
@@ -84,7 +84,7 @@ public AstNode getParent() {
    *
    * @param child AstNode to add
    */
-  public void addChild(AstNode child) {
+  public void addChild(@Nullable AstNode child) {
     if (child != null) {
       if (children.isEmpty()) {
         children = new ArrayList<>();

diff --git a/cxx-sslr/sslr-core/src/main/java/com/sonar/cxx/sslr/impl/matcher/GrammarFunctions.java b/cxx-sslr/sslr-core/src/main/java/com/sonar/cxx/sslr/impl/matcher/GrammarFunctions.java
@@ -24,6 +24,7 @@
 package com.sonar.cxx.sslr.impl.matcher;
 
 import com.sonar.cxx.sslr.api.TokenType;
+import javax.annotation.Nullable;
 import org.sonar.cxx.sslr.internal.vm.ParsingExpression;
 import org.sonar.cxx.sslr.internal.vm.SequenceExpression;
 import org.sonar.cxx.sslr.internal.vm.lexerful.TokenTypeClassExpression;
@@ -76,7 +77,7 @@ private static ParsingExpression convertToExpression(Object e) {
     return expression;
   }
 
-  private static void checkSize(Object[] e) {
+  private static void checkSize(@Nullable Object[] e) {
     if (e == null || e.length == 0) {
       throw new IllegalArgumentException("You must define at least one matcher.");
     }

diff --git a/cxx-sslr/sslr-core/src/main/java/org/sonar/cxx/sslr/channel/CodeReader.java b/cxx-sslr/sslr-core/src/main/java/org/sonar/cxx/sslr/channel/CodeReader.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.util.regex.Matcher;
+import javax.annotation.Nullable;
 
 /**
  * The CodeReader class provides some advanced features to read a source code. The most important one is the ability to
@@ -141,7 +142,7 @@ public final int popTo(Matcher matcher, Appendable appendable) {
    * @param appendable the consumed characters are appended to this appendable
    * @return number of consumed characters or -1 if one of the two Matchers doesn't match
    */
-  public final int popTo(Matcher matcher, Matcher afterMatcher, Appendable appendable) {
+  public final int popTo(Matcher matcher, @Nullable Matcher afterMatcher, Appendable appendable) {
     try {
       matcher.reset(this);
       if (matcher.lookingAt()) {

diff --git a/cxx-sslr/sslr-toolkit/src/main/java/org/sonar/cxx/sslr/internal/toolkit/ToolkitViewImpl.java b/cxx-sslr/sslr-toolkit/src/main/java/org/sonar/cxx/sslr/internal/toolkit/ToolkitViewImpl.java
@@ -502,7 +502,7 @@ public AstNode getAstNodeFollowingCurrentSourceCodeTextCursorPosition() {
     return getFollowingAstNode((DefaultMutableTreeNode) astTree.getModel().getRoot(), currentOffset);
   }
 
-  private AstNode getFollowingAstNode(DefaultMutableTreeNode treeNode, int offset) {
+  private AstNode getFollowingAstNode(@Nullable DefaultMutableTreeNode treeNode, int offset) {
     AstNode followingAstNode = null;
 
     if (treeNode != null) {