github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-28 03:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

rubygems: Reformat and consisitent parameter naming in private methods.

Browse Source
This commit is contained in:
Dale Visser
2015-08-11 13:56:01 -04:00
parent 89166e81fb
commit 235869fc79
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/RubyGemspecAnalyzer.java
View File

@@ -115,7 +115,7 @@ public class RubyGemspecAnalyzer extends AbstractFileTypeAnalyzer {
"Problem occurred while reading dependency file.", e); "Problem occurred while reading dependency file.", e);
} }
final Matcher matcher = GEMSPEC_BLOCK_INIT.matcher(contents); final Matcher matcher = GEMSPEC_BLOCK_INIT.matcher(contents);
if (matcher.find()){ if (matcher.find()) {
contents = contents.substring(matcher.end()); contents = contents.substring(matcher.end());
final String blockVariable = matcher.group(1); final String blockVariable = matcher.group(1);
final EvidenceCollection vendor = dependency.getVendorEvidence(); final EvidenceCollection vendor = dependency.getVendorEvidence();
@@ -136,24 +136,24 @@ public class RubyGemspecAnalyzer extends AbstractFileTypeAnalyzer {
} }
} }
private void addListEvidence(EvidenceCollection vendorEvidence, String contents, private void addListEvidence(EvidenceCollection evidences, String contents,
String blockVariable, String field, Confidence confidence) { String blockVariable, String field, Confidence confidence) {
final Matcher matcher = Pattern.compile( final Matcher matcher = Pattern.compile(
String.format("\\s+?%s\\.%s\\s*?=\\s*?\\[(.*?)\\]", blockVariable, field)).matcher(contents); String.format("\\s+?%s\\.%s\\s*?=\\s*?\\[(.*?)\\]", blockVariable, field)).matcher(contents);
if (matcher.find()) { if (matcher.find()) {
final String value = matcher.group(1).replaceAll("['\"]", " ").trim(); final String value = matcher.group(1).replaceAll("['\"]", " ").trim();
vendorEvidence.addEvidence(GEMSPEC, field, value, confidence); evidences.addEvidence(GEMSPEC, field, value, confidence);
} }
} }
private String addStringEvidence(EvidenceCollection collection, String contents, private String addStringEvidence(EvidenceCollection evidences, String contents,
String blockVariable, String field, Confidence confidence) { String blockVariable, String field, Confidence confidence) {
final Matcher matcher = Pattern.compile( final Matcher matcher = Pattern.compile(
String.format("\\s+?%s\\.%s\\s*?=\\s*?(['\"])(.*?)\\1", blockVariable, field)).matcher(contents); String.format("\\s+?%s\\.%s\\s*?=\\s*?(['\"])(.*?)\\1", blockVariable, field)).matcher(contents);
String value = ""; String value = "";
if (matcher.find()){ if (matcher.find()) {
value = matcher.group(2); value = matcher.group(2);
collection.addEvidence(GEMSPEC, field, value, confidence); evidences.addEvidence(GEMSPEC, field, value, confidence);
} }
return value; return value;
} }