fix: Replace org.antlr.misc.Nullable imports since they are no longer…

… resolved by Detect
blackducksoftware · May 19, 2020 · db429cd · db429cd
1 parent b435252
commit db429cd
Show file tree

Hide file tree

Showing 18 changed files with 101 additions and 101 deletions.
diff --git a/configuration/src/main/java/com/synopsys/integration/configuration/property/Property.java b/configuration/src/main/java/com/synopsys/integration/configuration/property/Property.java
@@ -26,7 +26,7 @@
 import java.util.List;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.synopsys.integration.configuration.util.Category;
 import com.synopsys.integration.configuration.util.Group;

diff --git a/...com/synopsys/integration/configuration/property/types/enumextended/ExtendedEnumValue.java b/...com/synopsys/integration/configuration/property/types/enumextended/ExtendedEnumValue.java
@@ -25,7 +25,7 @@
 import java.util.Optional;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.util.Assert;
 
 import com.synopsys.integration.configuration.util.Bdo;

diff --git a/...in/java/com/synopsys/integration/configuration/property/types/enumsoft/SoftEnumValue.java b/...in/java/com/synopsys/integration/configuration/property/types/enumsoft/SoftEnumValue.java
@@ -26,7 +26,7 @@
 import java.util.Optional;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.util.Assert;
 
 // An enum that can be the given ENUM or can be STRING

diff --git a/...ration/src/main/java/com/synopsys/integration/configuration/source/MapPropertySource.java b/...ration/src/main/java/com/synopsys/integration/configuration/source/MapPropertySource.java
@@ -26,7 +26,7 @@
 import java.util.Set;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.synopsys.integration.configuration.util.Bds;
 import com.synopsys.integration.configuration.util.KeyUtils;

diff --git a/...iguration/src/main/java/com/synopsys/integration/configuration/source/PropertySource.java b/...iguration/src/main/java/com/synopsys/integration/configuration/source/PropertySource.java
@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 // IMPORTANT
 // A property source is responsible for responding with keys in the normalized form "example.key"

diff --git a/...configuration/src/main/java/com/synopsys/integration/detect/help/json/HelpJsonOption.java b/...configuration/src/main/java/com/synopsys/integration/detect/help/json/HelpJsonOption.java
@@ -25,7 +25,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 class HelpJsonOption {
     private String propertyName = "";

diff --git a/...om/synopsys/integration/detectable/detectable/executable/impl/SimpleExecutableFinder.java b/...om/synopsys/integration/detectable/detectable/executable/impl/SimpleExecutableFinder.java
@@ -1,85 +1,85 @@
-/**
- * detectable
- *
- * Copyright (c) 2020 Synopsys, Inc.
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.synopsys.integration.detectable.detectable.executable.impl;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.antlr.v4.runtime.misc.Nullable;
-
-import com.synopsys.integration.detectable.detectable.file.FileFinder;
-import com.synopsys.integration.util.OperatingSystemType;
-
-public class SimpleExecutableFinder {
-    private final List<String> extensions;
-    private final FileFinder fileFinder;
-
-    public static SimpleExecutableFinder forCurrentOperatingSystem(final FileFinder fileFinder) {
-        return SimpleExecutableFinder.forOperatingSystem(OperatingSystemType.determineFromSystem(), fileFinder);
-    }
-
-    public static SimpleExecutableFinder forOperatingSystem(final OperatingSystemType operatingSystemType, final FileFinder fileFinder) {
-        if (operatingSystemType == OperatingSystemType.WINDOWS) {
-            return new SimpleExecutableFinder(Arrays.asList(".cmd", ".bat", ".exe"), fileFinder);
-        } else {
-            return new SimpleExecutableFinder(Collections.emptyList(), fileFinder);
-        }
-    }
-
-    public SimpleExecutableFinder(final List<String> extensions, final FileFinder fileFinder) {
-        this.extensions = extensions;
-        this.fileFinder = fileFinder;
-    }
-
-    private List<String> executablesFromName(final String name) {
-        if (extensions.isEmpty()) {
-            return Collections.singletonList(name);
-        } else {
-            return extensions.stream().map(ext -> name + ext).collect(Collectors.toList());
-        }
-    }
-
-    @Nullable
-    public File findExecutable(final String executable, final File location) {
-        return findExecutable(executable, Collections.singletonList(location));
-    }
-
-    @Nullable
-    public File findExecutable(final String executable, final List<File> locations) {
-        final List<String> executables = executablesFromName(executable);
-
-        for (final File location : locations) {
-            for (final String possibleExecutable : executables) {
-                final File foundFile = fileFinder.findFile(location, possibleExecutable);
-                if (foundFile != null && foundFile.exists() && foundFile.canExecute()) {
-                    return foundFile;
-                }
-            }
-        }
-
-        return null;
-    }
+/**
+ * detectable
+ *
+ * Copyright (c) 2020 Synopsys, Inc.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.synopsys.integration.detectable.detectable.executable.impl;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.synopsys.integration.detectable.detectable.file.FileFinder;
+import com.synopsys.integration.util.OperatingSystemType;
+
+public class SimpleExecutableFinder {
+    private final List<String> extensions;
+    private final FileFinder fileFinder;
+
+    public static SimpleExecutableFinder forCurrentOperatingSystem(final FileFinder fileFinder) {
+        return SimpleExecutableFinder.forOperatingSystem(OperatingSystemType.determineFromSystem(), fileFinder);
+    }
+
+    public static SimpleExecutableFinder forOperatingSystem(final OperatingSystemType operatingSystemType, final FileFinder fileFinder) {
+        if (operatingSystemType == OperatingSystemType.WINDOWS) {
+            return new SimpleExecutableFinder(Arrays.asList(".cmd", ".bat", ".exe"), fileFinder);
+        } else {
+            return new SimpleExecutableFinder(Collections.emptyList(), fileFinder);
+        }
+    }
+
+    public SimpleExecutableFinder(final List<String> extensions, final FileFinder fileFinder) {
+        this.extensions = extensions;
+        this.fileFinder = fileFinder;
+    }
+
+    private List<String> executablesFromName(final String name) {
+        if (extensions.isEmpty()) {
+            return Collections.singletonList(name);
+        } else {
+            return extensions.stream().map(ext -> name + ext).collect(Collectors.toList());
+        }
+    }
+
+    @Nullable
+    public File findExecutable(final String executable, final File location) {
+        return findExecutable(executable, Collections.singletonList(location));
+    }
+
+    @Nullable
+    public File findExecutable(final String executable, final List<File> locations) {
+        final List<String> executables = executablesFromName(executable);
+
+        for (final File location : locations) {
+            for (final String possibleExecutable : executables) {
+                final File foundFile = fileFinder.findFile(location, possibleExecutable);
+                if (foundFile != null && foundFile.exists() && foundFile.canExecute()) {
+                    return foundFile;
+                }
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/detectable/src/main/java/com/synopsys/integration/detectable/detectable/file/FileFinder.java b/detectable/src/main/java/com/synopsys/integration/detectable/detectable/file/FileFinder.java
@@ -27,7 +27,7 @@
 import java.util.List;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public interface FileFinder {
     @Nullable

diff --git a/...src/main/java/com/synopsys/integration/detectable/detectable/inspector/go/GoResolver.java b/...src/main/java/com/synopsys/integration/detectable/detectable/inspector/go/GoResolver.java
@@ -24,7 +24,7 @@
 
 import java.io.File;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.synopsys.integration.detectable.detectable.exception.DetectableException;
 

diff --git a/...main/java/com/synopsys/integration/detectable/detectables/bitbake/model/BitbakeGraph.java b/...main/java/com/synopsys/integration/detectable/detectables/bitbake/model/BitbakeGraph.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class BitbakeGraph {
     private final List<BitbakeNode> nodes = new ArrayList<>();

diff --git a/.../com/synopsys/integration/detect/configuration/connection/BlackDuckConnectionDetails.java b/.../com/synopsys/integration/detect/configuration/connection/BlackDuckConnectionDetails.java
@@ -26,7 +26,7 @@
 import java.util.Optional;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class BlackDuckConnectionDetails {
     private final Boolean offline;

diff --git a/...main/java/com/synopsys/integration/detect/configuration/connection/ConnectionFactory.java b/...main/java/com/synopsys/integration/detect/configuration/connection/ConnectionFactory.java
@@ -23,7 +23,7 @@
 package com.synopsys.integration.detect.configuration.connection;
 
 import org.antlr.v4.runtime.misc.NotNull;
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.synopsys.integration.detect.util.ProxyUtil;
 import com.synopsys.integration.log.IntLogger;

diff --git a/src/main/java/com/synopsys/integration/detect/lifecycle/run/RunManager.java b/src/main/java/com/synopsys/integration/detect/lifecycle/run/RunManager.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/com/synopsys/integration/detect/lifecycle/run/RunOptions.java b/src/main/java/com/synopsys/integration/detect/lifecycle/run/RunOptions.java
@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.synopsys.integration.detect.DetectTool;
 import com.synopsys.integration.detect.util.filter.DetectToolFilter;

diff --git a/src/main/java/com/synopsys/integration/detect/tool/DetectableToolResult.java b/src/main/java/com/synopsys/integration/detect/tool/DetectableToolResult.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.synopsys.integration.detect.workflow.codelocation.DetectCodeLocation;
 import com.synopsys.integration.detect.workflow.project.DetectToolProjectInfo;

diff --git a/src/main/java/com/synopsys/integration/detect/tool/binaryscanner/BinaryScanOptions.java b/src/main/java/com/synopsys/integration/detect/tool/binaryscanner/BinaryScanOptions.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class BinaryScanOptions {
     private final Path singleTargetFilePath;

diff --git a/...m/synopsys/integration/detect/tool/signaturescanner/BlackDuckSignatureScannerOptions.java b/...m/synopsys/integration/detect/tool/signaturescanner/BlackDuckSignatureScannerOptions.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.IndividualFileMatching;
 import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching;

diff --git a/...java/com/synopsys/integration/detect/workflow/codelocation/CodeLocationNameGenerator.java b/...java/com/synopsys/integration/detect/workflow/codelocation/CodeLocationNameGenerator.java
@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.antlr.v4.runtime.misc.Nullable;
+import org.jetbrains.annotations.Nullable;
 import org.apache.commons.lang3.StringUtils;
 
 import com.synopsys.integration.detect.workflow.file.DetectFileUtils;