Fixed jenkinsci#394 - Replace library code with self implemented.

khmarbaise · khmarbaise · commit 812ca294e68d · 2019-03-30T11:57:04.000+01:00
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,7 +2,9 @@
 
 ## Release 0.3.9 (NOT RELEASED YET)
 
- * ...
+ * [Fixed Issue 394][issue-394]
+   
+   Replace `Strings.isNullOrEmpty()` with self implemented code. 
 
  * [Pull Request #386][pull-386] 
 
diff --git a/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java b/jenkins-client/src/main/java/com/offbytwo/jenkins/model/BuildWithDetails.java
@@ -273,12 +273,16 @@ public void updateDescription(String description) throws IOException {
         updateDescription(description, false);
     }
 
+    private boolean isNullOrEmpty(String value) {
+        return value == null || value.isEmpty();
+    }
+
     private BuildCause convertToBuildCause(Map<String, Object> cause) {
         BuildCause cause_object = new BuildCause();
 
         // TODO: Think about it. Can this be done more simpler?
         String description = (String) cause.get("shortDescription");
-        if (!Strings.isNullOrEmpty(description)) {
+        if (!isNullOrEmpty(description)) {
             cause_object.setShortDescription(description);
         }
 
@@ -288,22 +292,22 @@ private BuildCause convertToBuildCause(Map<String, Object> cause) {
         }
 
         String upstreamProject = (String) cause.get("upstreamProject");
-        if (!Strings.isNullOrEmpty(upstreamProject)) {
+        if (!isNullOrEmpty(upstreamProject)) {
             cause_object.setUpstreamProject(upstreamProject);
         }
 
         String upstreamUrl = (String) cause.get("upstreamUrl");
-        if (!Strings.isNullOrEmpty(upstreamUrl)) {
+        if (!isNullOrEmpty(upstreamUrl)) {
             cause_object.setUpstreamUrl(upstreamUrl);
         }
 
         String userId = (String) cause.get("userId");
-        if (!Strings.isNullOrEmpty(userId)) {
+        if (!isNullOrEmpty(userId)) {
             cause_object.setUserId(userId);
         }
 
         String userName = (String) cause.get("userName");
-        if (!Strings.isNullOrEmpty(userName)) {
+        if (!isNullOrEmpty(userName)) {
             cause_object.setUserName(userName);
         }
         return cause_object;

Original file line number	Diff line number	Diff line change
`@@ -273,12 +273,16 @@ public void updateDescription(String description) throws IOException {`
`273`	`273`	`updateDescription(description, false);`
`274`	`274`	`}`
`275`	`275`
	`276`	`+ private boolean isNullOrEmpty(String value) {`
	`277`	`+ return value == null \|\| value.isEmpty();`
	`278`	`+ }`
	`279`	`+`
`276`	`280`	`private BuildCause convertToBuildCause(Map<String, Object> cause) {`
`277`	`281`	`BuildCause cause_object = new BuildCause();`
`278`	`282`
`279`	`283`	`// TODO: Think about it. Can this be done more simpler?`
`280`	`284`	`String description = (String) cause.get("shortDescription");`
`281`		`- if (!Strings.isNullOrEmpty(description)) {`
	`285`	`+ if (!isNullOrEmpty(description)) {`
`282`	`286`	`cause_object.setShortDescription(description);`
`283`	`287`	`}`
`284`	`288`
`@@ -288,22 +292,22 @@ private BuildCause convertToBuildCause(Map<String, Object> cause) {`
`288`	`292`	`}`
`289`	`293`
`290`	`294`	`String upstreamProject = (String) cause.get("upstreamProject");`
`291`		`- if (!Strings.isNullOrEmpty(upstreamProject)) {`
	`295`	`+ if (!isNullOrEmpty(upstreamProject)) {`
`292`	`296`	`cause_object.setUpstreamProject(upstreamProject);`
`293`	`297`	`}`
`294`	`298`
`295`	`299`	`String upstreamUrl = (String) cause.get("upstreamUrl");`
`296`		`- if (!Strings.isNullOrEmpty(upstreamUrl)) {`
	`300`	`+ if (!isNullOrEmpty(upstreamUrl)) {`
`297`	`301`	`cause_object.setUpstreamUrl(upstreamUrl);`
`298`	`302`	`}`
`299`	`303`
`300`	`304`	`String userId = (String) cause.get("userId");`
`301`		`- if (!Strings.isNullOrEmpty(userId)) {`
	`305`	`+ if (!isNullOrEmpty(userId)) {`
`302`	`306`	`cause_object.setUserId(userId);`
`303`	`307`	`}`
`304`	`308`
`305`	`309`	`String userName = (String) cause.get("userName");`
`306`		`- if (!Strings.isNullOrEmpty(userName)) {`
	`310`	`+ if (!isNullOrEmpty(userName)) {`
`307`	`311`	`cause_object.setUserName(userName);`
`308`	`312`	`}`
`309`	`313`	`return cause_object;`