conforming to java idiom

blackducksoftware · Sep 14, 2016 · 8dda602 · 8dda602
1 parent 0483f19
commit 8dda602
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/blackducksoftware/integration/build/BuildArtifact.java b/src/main/java/com/blackducksoftware/integration/build/BuildArtifact.java
@@ -33,9 +33,9 @@ public class BuildArtifact implements Serializable {
 	private String id = null;
 
 	private void setId() {
-		if (null != group && null != artifact && null != version) {
+		if (group != null && artifact != null && version != null) {
 			id = group + ":" + artifact + ":" + version;
-		} else if (null != artifact && null != version) {
+		} else if (artifact != null && version != null) {
 			id = artifact + ":" + version;
 		}
 	}

diff --git a/src/main/java/com/blackducksoftware/integration/build/BuildDependency.java b/src/main/java/com/blackducksoftware/integration/build/BuildDependency.java
@@ -30,7 +30,7 @@ public class BuildDependency {
 	private String version;
 	private String id;
 	private String classifier;
-	private Set<String> scopes = new HashSet<String>();;
+	private Set<String> scopes = new HashSet<>();;
 	private String extension;
 	private MatchType matchType = MatchType.UNKNOWNMATCH;
 	private String projectName;
@@ -39,9 +39,9 @@ public class BuildDependency {
 	private VulnerabilityCounts vulnerabilityCounts = new VulnerabilityCounts();
 
 	private void setId() {
-		if (null != group && null != artifact && null != version) {
+		if (group != null && artifact != null && version != null) {
 			id = group + ":" + artifact + ":" + version;
-		} else if (null != artifact && null != version) {
+		} else if (artifact != null && version != null) {
 			id = artifact + ":" + version;
 		}
 	}