Skip to content

Commit f6410f6

Browse files
committed
fix typos
1 parent d05bc03 commit f6410f6

File tree

34 files changed

+65
-72
lines changed

34 files changed

+65
-72
lines changed

.github/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
If you decide to contribute to our repository, please follow our [Code of conduct](./CODE_OF_CONDUCT.md) when contributing. We value all contributions and will review them as soon as we can.
44

55
### Bugs
6-
When using our software, it is possible that you will come across a bug. If this happens, Be sure to come to our issues page to see if anyone else has ran into this same problem. If no one has reported it, then please submit an issue followig this [Issue template](./ISSUE_TEMPLATE.md).
6+
When using our software, it is possible that you will come across a bug. If this happens, Be sure to come to our issues page to see if anyone else has ran into this same problem. If no one has reported it, then please submit an issue following this [Issue template](./ISSUE_TEMPLATE.md).
77

88
### Issues
9-
When you don't run into a bug, but have an issue or a question, then the best option is to message our [Support team](https://www.blackducksoftware.com/support/contact-support). They are available 24 hours a day and work directly with us to resovle any issues you may have.
9+
When you don't run into a bug, but have an issue or a question, then the best option is to message our [Support team](https://www.blackducksoftware.com/support/contact-support). They are available 24 hours a day and work directly with us to resolve any issues you may have.
1010

1111
## Pull Requests
1212
Anyone can directly contribute to our integrations by opening their own branch and creating a pull request. When doing so, please follow the [Pull request template](./PULL_REQUEST_TEMPLATE.md) so that we can review your request more quickly and get your code into master.
@@ -17,6 +17,6 @@ When creating code to be merged into our project, please adhere to the following
1717
* [Our eclipse formatting used in all our projects](https://blackducksoftware.github.io/integration-resources/eclipse/IntegrationOssFormat.xml)
1818

1919
## Other ways to contribute
20-
In addition to the options you have above, you can also contirbute to our project by helping others who are seeking help. If you see an open issue that you know the answer to, then feel free to respond to the users inquiry. This will help us to get everyone the answers they need as soon as possible.
20+
In addition to the options you have above, you can also contribute to our project by helping others who are seeking help. If you see an open issue that you know the answer to, then feel free to respond to the users inquiry. This will help us to get everyone the answers they need as soon as possible.
2121

2222
Thank you for your interest in contributing to the Blackduck Software Integration's teams project.

configuration/src/test/java/com/synopsys/integration/configuration/config/PropertyConfigurationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public void getRawFromPredicate() {
253253
}
254254

255255
@Test
256-
public void getRawPassthroughMutlipleValues() {
256+
public void getRawPassthroughMultipleValues() {
257257
final PassthroughProperty passthrough = new PassthroughProperty("pass");
258258
final PropertySource secondarySource = propertySourceOf("secondary", Pair.of("pass.two", "two value"), Pair.of("ignore", "ignore value"));
259259
final PropertySource primarySource = propertySourceOf("primary", Pair.of("pass.one", "one value"));

configuration/src/test/java/com/synopsys/integration/configuration/property/PropertyTestHelpUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.synopsys.integration.configuration.property.base.ValuedProperty;
3535

3636
/**
37-
* Ensure's the Property classes are providing necessary property descriptions for help doc.
37+
* Ensures the Property classes are providing necessary property descriptions for help doc.
3838
*/
3939
public class PropertyTestHelpUtil {
4040

configuration/src/test/java/com/synopsys/integration/configuration/property/types/path/TildeInPathResolverTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ public class TildeInPathResolverTest {
3737
@DisabledOnOs(WINDOWS) // Due to backslashes being flipped.
3838
public void testResolvingTilde() {
3939
final TildeInPathResolver resolver = new TildeInPathResolver("/Users/ekerwin");
40-
final Path resolved = resolver.resolvePath("~/Documents/source/funtional/detect");
40+
final Path resolved = resolver.resolvePath("~/Documents/source/functional/detect");
4141

4242
Assertions.assertNotNull(resolved, "Resolved path should not be null.");
43-
Assertions.assertEquals("/Users/ekerwin/Documents/source/funtional/detect", resolved.toString(), "Tilde's should be resolved on Unix operating systems.");
43+
Assertions.assertEquals("/Users/ekerwin/Documents/source/functional/detect", resolved.toString(), "Tilde's should be resolved on Unix operating systems.");
4444
}
4545

4646
@Test
4747
@DisabledOnOs(WINDOWS) // Due to backslashes being flipped.
4848
public void testResolvingTildeInTheMiddleOfAPath() {
4949
final TildeInPathResolver resolver = new TildeInPathResolver("/Users/ekerwin");
50-
final String filePath = "/Documents/~source/~/funtional/detect";
50+
final String filePath = "/Documents/~source/~/functional/detect";
5151
final Path resolved = resolver.resolvePath(filePath);
5252

5353
Assertions.assertNotNull(resolved, "Resolved path should not be null.");

detectable/src/main/java/com/synopsys/integration/detectable/detectable/explanation/PropertyProvided.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ public PropertyProvided(String property) {
3131

3232
@Override
3333
public String describeSelf() {
34-
return "Property provded: " + property;
34+
return "Property provided: " + property;
3535
}
3636
}

detectable/src/main/java/com/synopsys/integration/detectable/detectables/conda/CondaCliDetectable.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323
package com.synopsys.integration.detectable.detectables.conda;
2424

25-
import java.io.File;
26-
2725
import com.synopsys.integration.detectable.Detectable;
2826
import com.synopsys.integration.detectable.DetectableEnvironment;
2927
import com.synopsys.integration.detectable.detectable.Requirements;
@@ -35,15 +33,10 @@
3533
import com.synopsys.integration.detectable.detectable.result.DetectableResult;
3634
import com.synopsys.integration.detectable.extraction.Extraction;
3735
import com.synopsys.integration.detectable.extraction.ExtractionEnvironment;
38-
import com.synopsys.integration.detectable.detectable.result.ExecutableNotFoundDetectableResult;
39-
import com.synopsys.integration.detectable.detectable.result.FileNotFoundDetectableResult;
40-
import com.synopsys.integration.detectable.detectable.result.PassedDetectableResult;
41-
import com.synopsys.integration.detectable.extraction.Extraction;
42-
import com.synopsys.integration.detectable.extraction.ExtractionEnvironment;
4336

4437
@DetectableInfo(language = "Python", forge = "Anaconda", requirementsMarkdown = "File: environment.yml. <br /><br /> Executable: conda.")
4538
public class CondaCliDetectable extends Detectable {
46-
public static final String ENVIRONEMNT_YML = "environment.yml";
39+
public static final String ENVIRONMENT_YML = "environment.yml";
4740

4841
private final FileFinder fileFinder;
4942
private CondaResolver condaResolver;
@@ -63,7 +56,7 @@ public CondaCliDetectable(DetectableEnvironment environment, FileFinder fileFind
6356
@Override
6457
public DetectableResult applicable() {
6558
Requirements requirements = new Requirements(fileFinder, environment);
66-
requirements.file(ENVIRONEMNT_YML);
59+
requirements.file(ENVIRONMENT_YML);
6760
return requirements.result();
6861
}
6962

detectable/src/main/java/com/synopsys/integration/detectable/detectables/gradle/inspection/model/GradleTreeNode.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public int getLevel() {
5050

5151
public enum NodeType {
5252
GAV,
53-
UNKOWN,
53+
UNKNOWN,
5454
PROJECT
5555
}
5656

@@ -68,6 +68,6 @@ public static GradleTreeNode newGav(final int level, final String name, final St
6868
}
6969

7070
public static GradleTreeNode newUnknown(final int level) {
71-
return new GradleTreeNode(NodeType.UNKOWN, level, null, null);
71+
return new GradleTreeNode(NodeType.UNKNOWN, level, null, null);
7272
}
7373
}

detector/src/main/java/com/synopsys/integration/detector/base/DetectorEvaluation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,12 @@ public String getStatusReason() {
233233
return "Passed";
234234
}
235235

236-
public Optional<DetectorEvaluation> getSuccessfullFallback() {
236+
public Optional<DetectorEvaluation> getSuccessfulFallback() {
237237
if (fallbackTo != null) {
238238
if (fallbackTo.isExtractable()) {
239239
return Optional.of(fallbackTo);
240240
} else {
241-
return fallbackTo.getSuccessfullFallback();
241+
return fallbackTo.getSuccessfulFallback();
242242
}
243243
}
244244
return Optional.empty();

detector/src/main/java/com/synopsys/integration/detector/base/DetectorStatusCode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
public enum DetectorStatusCode {
2626
CARGO_LOCKFILE_NOT_FOUND("A Cargo.toml was located in the target project, but the Cargo.lock file was NOT located."),
27-
EXCEPTION("An exception occured."),
27+
EXCEPTION("An exception occurred."),
2828
EXCLUDED("Detector type was excluded."),
2929
EXECUTABLE_FAILED("During extraction, one or more executables did not execute successfully."),
3030
EXTRACTION_FAILED("During extraction, one or more exceptions were encountered."),

docs/templates/content/00-introduction.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ${solution_name} processing is divided into three phases:
5151

5252
### Initialization phase
5353

54-
During the initialization phase, ${solution_name} performs verification checks on the user-provided configration, checks to see if it
54+
During the initialization phase, ${solution_name} performs verification checks on the user-provided configuration, checks to see if it
5555
can connect to any external systems needed for the run, and creates any required directories.
5656

5757
### Run phase

docs/templates/content/40-configuring.ftl

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ bash <(curl -s -L https://detect.synopsys.com/detect.sh) --spring.profiles.activ
9191
This capability is provided by Spring Boot. For more information, refer to
9292
[Spring Boot's profile mechanism](https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-profiles).
9393

94-
## Additional configration methods and details
94+
## Additional configuration methods and details
9595

9696
${solution_name} reads property values using
9797
[Spring Boot's externalized configuration mechanism](https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config),
@@ -133,7 +133,7 @@ including:
133133

134134
* On the command line; for example, --blackduck.password={your password}.
135135
* As an environment variable value; for example, export BLACKDUCK_PASSWORD={your password}.
136-
* In a configration (.properties) file; for example, ./application.properties.
136+
* In a configuration (.properties) file; for example, ./application.properties.
137137

138138
Values provided on the command line may be visible to other users that can view process details.
139139
Setting sensitive values using environment variables is usually considered more secure.

docs/templates/content/advanced/aggregation.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ that (in the default non-aggregated scenario) would have appeared in the codeloc
2121
top level metadata components, moving the formerly top-level components down a level in the dependency
2222
graph. The downside to this is that *all* components (including direct dependencies) from the aggregated
2323
BDIO appear with dependency type *Transitive* in ${blackduck_product_name}. (A fix for this problem
24-
is planned for a future relelase.)
24+
is planned for a future release.)
2525

2626
In order to preserve the accuracy of the dependency type field in ${blackduck_product_name}, you can
2727
set property *detect.bom.aggregate.remediation.mode* to DIRECT, which tells ${solution_name} to keep

docs/templates/content/components/inspectors.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The Docker Inspector is available as a Java jar or shell script for Linux or Mac
2323

2424
If you are online, then Synopsys Artifactory is used to download the Docker Inspector jar file.
2525

26-
If you are offline, the Docker Inspector jar file and required Docker image tar files are sourced from the provided path to the Docker Inspetor air gap files.
26+
If you are offline, the Docker Inspector jar file and required Docker image tar files are sourced from the provided path to the Docker Inspector air gap files.
2727
${solution_name} loads the Docker images (container-based services that Docker Inspector depends on) from the provided image tar files so they are available to the Docker Inspector.
2828

2929
In both cases, the Docker Inspector jar is run which (by default) uses your Docker engine to start and stop the container-based services.

docs/templates/detectors.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ the system PATH to find executables. In some cases as an alternative to the syst
4747

4848
## Buildless detectors
4949

50-
When in buildless mode, only detectors that do not communicate with external systems are run. Typically these detectors just parse available package mananger files such as *pom.xml* to derive dependency information.
50+
When in buildless mode, only detectors that do not communicate with external systems are run. Typically these detectors just parse available package manager files such as *pom.xml* to derive dependency information.
5151
It is generally not recommended to run in buildless mode as the results are not guaranteed to be accurate - for example ${solution_name} may report dependencies with fuzzy versions.
5252
However if the project can not be built, buildless mode still allows some insight into the dependencies of a project.
5353

polaris/src/main/java/com/synopsys/integration/polaris/common/request/param/PolarisParamBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public Map.Entry<String, String> build() throws IllegalStateException {
9393
}
9494

9595
if (!ParamOperator.NONE.equals(operator)) {
96-
final String op = OPERATOR_PREFIX + makeCaseInsensitve(operator.getKey());
96+
final String op = OPERATOR_PREFIX + makeCaseInsensitive(operator.getKey());
9797
keyBuilder.append(getBracketed(op));
9898
}
9999

@@ -104,7 +104,7 @@ private void throwRequiredException(final String fieldName) {
104104
throw new IllegalStateException(String.format("The field '%s' is required", fieldName));
105105
}
106106

107-
private String makeCaseInsensitve(final String operator) {
107+
private String makeCaseInsensitive(final String operator) {
108108
if (!caseSensitive && (ParamOperator.OPERATOR_EQUALS.equalsKey(operator) || ParamOperator.OPERATOR_SUBSTRING.equalsKey(operator))) {
109109
return OPERATOR_KEY_INSENSITIVE_PREFIX + operator;
110110
}

polaris/src/main/java/com/synopsys/integration/polaris/common/service/JobService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void waitForJobStateIsCompletedOrDieByUrl(HttpUrl jobApiUrl, long timeout
101101
StringBuilder errorMessageBuilder = new StringBuilder();
102102
errorMessageBuilder.append(String.format("Job at url %s ended with state %s instead of %s", jobApiUrl, jobState, JobStatus.StateEnum.COMPLETED));
103103
if (JobStatus.StateEnum.FAILED.equals(jobState)) {
104-
// Niether Data nor Attributes can be null because they were validated above -- rotte MAR 2020
104+
// Neither Data nor Attributes can be null because they were validated above -- rotte MAR 2020
105105
FailureInfo failureInfo = jobResource.getData().getAttributes().getFailureInfo();
106106
if (failureInfo != null && StringUtils.isNotBlank(failureInfo.getUserFriendlyFailureReason())) {
107107
errorMessageBuilder.append(String.format(" because: %s", failureInfo.getUserFriendlyFailureReason()));

src/main/java/com/synopsys/integration/detect/configuration/DetectConfigurationFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,11 @@ public BlackDuckPostOptions createBlackDuckPostOptions() {
465465

466466
public BinaryScanOptions createBinaryScanOptions() {
467467
Path singleTarget = getPathOrNull(DetectProperties.DETECT_BINARY_SCAN_FILE.getProperty());
468-
List<String> mutlipleTargets = getValue(DetectProperties.DETECT_BINARY_SCAN_FILE_NAME_PATTERNS);
468+
List<String> multipleTargets = getValue(DetectProperties.DETECT_BINARY_SCAN_FILE_NAME_PATTERNS);
469469
String codeLocationPrefix = getNullableValue(DetectProperties.DETECT_PROJECT_CODELOCATION_PREFIX);
470470
String codeLocationSuffix = getNullableValue(DetectProperties.DETECT_PROJECT_CODELOCATION_SUFFIX);
471471
Integer searchDepth = getValue(DetectProperties.DETECT_BINARY_SCAN_SEARCH_DEPTH);
472-
return new BinaryScanOptions(singleTarget, mutlipleTargets, codeLocationPrefix, codeLocationSuffix, searchDepth);
472+
return new BinaryScanOptions(singleTarget, multipleTargets, codeLocationPrefix, codeLocationSuffix, searchDepth);
473473
}
474474

475475
public ImpactAnalysisOptions createImpactAnalysisOptions() {

src/main/java/com/synopsys/integration/detect/configuration/help/print/HelpPrinter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public void printOption(final HelpTextWriter writer, final Property property) {
176176

177177
public void printOptions(final HelpTextWriter writer, final List<Property> options, final String notes) {
178178
writer.printColumns("Property Name", "Default", "Description");
179-
writer.printSeperator();
179+
writer.printSeparator();
180180

181181
final List<Property> sorted = options.stream()
182182
.sorted(SORT_BY_GROUP_THEN_KEY)

src/main/java/com/synopsys/integration/detect/configuration/help/print/HelpTextWriter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void printColumns(String... columns) {
4747
pieces.add(headerText);
4848
}
4949

50-
public void printSeperator() {
50+
public void printSeparator() {
5151
println(StringUtils.repeat('_', 175));
5252
}
5353

src/main/java/com/synopsys/integration/detect/interactive/InteractiveModeDecisionTree.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class InteractiveModeDecisionTree implements DecisionTree {
4040
public static final String SHOULD_SAVE_TO_PROFILE = "Would you like save these settings to a profile?";
4141
public static final String SET_PROFILE_NAME = "What is the profile name?";
4242
public static final String SHOULD_CONNECT_TO_BLACKDUCK = "Would you like to connect to a Black Duck server?";
43-
public static final String SHOULD_SET_PROJECT_NAME_VERSON = "Would you like to provide a project name and version to use?";
43+
public static final String SHOULD_SET_PROJECT_NAME_VERSION = "Would you like to provide a project name and version to use?";
4444
public static final String SET_PROJECT_NAME = "What is the project name?";
4545
public static final String SET_PROJECT_VERSION = "What is the project version?";
4646
public static final String SHOULD_RUN_SIGNATURE_SCAN = "Would you like to run a signature scan?";
@@ -65,7 +65,7 @@ public void traverse(InteractivePropertySourceBuilder propertySourceBuilder, Int
6565
BlackDuckConnectionDecisionBranch blackDuckConnectionDecisionBranch = new BlackDuckConnectionDecisionBranch(detectInfo, blackDuckConnectivityChecker, existingPropertySources);
6666
blackDuckConnectionDecisionBranch.traverse(propertySourceBuilder, writer);
6767

68-
Boolean customDetails = writer.askYesOrNo(SHOULD_SET_PROJECT_NAME_VERSON);
68+
Boolean customDetails = writer.askYesOrNo(SHOULD_SET_PROJECT_NAME_VERSION);
6969
if (customDetails) {
7070
propertySourceBuilder.setPropertyFromQuestion(DETECT_PROJECT_NAME, SET_PROJECT_NAME);
7171
propertySourceBuilder.setPropertyFromQuestion(DETECT_PROJECT_VERSION_NAME, SET_PROJECT_VERSION);

src/main/java/com/synopsys/integration/detect/tool/detector/DetectorIssuePublisher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private void addIfNotEmpty(final List<String> messages, final String prefix, fin
8181
private void addFallbackIfNotEmpty(final List<String> messages, final String prefix, final String spacer, final List<DetectorEvaluation> evaluations, final Function<DetectorEvaluation, String> reason) {
8282
if (evaluations.size() > 0) {
8383
evaluations.forEach(evaluation -> {
84-
final Optional<DetectorEvaluation> fallback = evaluation.getSuccessfullFallback();
84+
final Optional<DetectorEvaluation> fallback = evaluation.getSuccessfulFallback();
8585
fallback.ifPresent(detectorEvaluation -> {
8686
messages.add(prefix + detectorEvaluation.getDetectorRule().getDescriptiveName());
8787
messages.add(spacer + "Preferred Detector: " + evaluation.getDetectorRule().getDescriptiveName());

src/main/java/com/synopsys/integration/detect/workflow/blackduck/developer/BlackDuckRapidModePostActions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ private void printViolatedPolicyNames(String componentName, String componentVers
138138
}
139139
}
140140

141-
private boolean checkVulnerabilityErrorsAndLog(Set<PolicyViolationVulnerabilityView> vulnerabilites) {
141+
private boolean checkVulnerabilityErrorsAndLog(Set<PolicyViolationVulnerabilityView> vulnerabilities) {
142142
boolean hasErrors = false;
143-
for (PolicyViolationVulnerabilityView vulnerabilityPolicyViolation : vulnerabilites) {
143+
for (PolicyViolationVulnerabilityView vulnerabilityPolicyViolation : vulnerabilities) {
144144
boolean hasError = StringUtils.isNotBlank(vulnerabilityPolicyViolation.getErrorMessage());
145145
boolean hasWarning = StringUtils.isNotBlank(vulnerabilityPolicyViolation.getWarningMessage());
146146
if (hasError) {

0 commit comments

Comments
 (0)