Vulnerable Software: Compact toString() output; remove accessor calls for own properties

This commit is contained in:
Jens Hausherr
2016-06-03 09:54:25 +02:00
parent fccd683b50
commit 578dc63652

View File

@@ -73,7 +73,7 @@ public class VulnerableSoftware extends IndexEntry implements Serializable, Comp
public void parseName(String cpeName) throws UnsupportedEncodingException { public void parseName(String cpeName) throws UnsupportedEncodingException {
this.name = cpeName; this.name = cpeName;
if (cpeName != null && cpeName.length() > 7) { if (cpeName != null && cpeName.length() > 7) {
final String[] data = cpeName.substring(7).split(":", 4); final String[] data = cpeName.substring(7).split(":");
if (data.length >= 1) { if (data.length >= 1) {
this.setVendor(urlDecode(data[0])); this.setVendor(urlDecode(data[0]));
} }
@@ -138,7 +138,7 @@ public class VulnerableSoftware extends IndexEntry implements Serializable, Comp
return false; return false;
} }
final VulnerableSoftware other = (VulnerableSoftware) obj; final VulnerableSoftware other = (VulnerableSoftware) obj;
if ((this.getName() == null) ? (other.getName() != null) : !this.getName().equals(other.getName())) { if ((this.name == null) ? (other.getName() != null) : !this.name.equals(other.getName())) {
return false; return false;
} }
return true; return true;
@@ -152,7 +152,7 @@ public class VulnerableSoftware extends IndexEntry implements Serializable, Comp
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 7; int hash = 7;
hash = 83 * hash + (this.getName() != null ? this.getName().hashCode() : 0); hash = 83 * hash + (this.name != null ? this.name.hashCode() : 0);
return hash; return hash;
} }
@@ -163,7 +163,7 @@ public class VulnerableSoftware extends IndexEntry implements Serializable, Comp
*/ */
@Override @Override
public String toString() { public String toString() {
return "VulnerableSoftware{ name=" + name + ", previousVersion=" + previousVersion + '}'; return "VulnerableSoftware{" + name + "[" + previousVersion + "]}";
} }
/** /**
@@ -175,7 +175,7 @@ public class VulnerableSoftware extends IndexEntry implements Serializable, Comp
@Override @Override
public int compareTo(VulnerableSoftware vs) { public int compareTo(VulnerableSoftware vs) {
int result = 0; int result = 0;
final String[] left = this.getName().split(":"); final String[] left = this.name.split(":");
final String[] right = vs.getName().split(":"); final String[] right = vs.getName().split(":");
final int max = (left.length <= right.length) ? left.length : right.length; final int max = (left.length <= right.length) ? left.length : right.length;
if (max > 0) { if (max > 0) {