Removing custom Optional

Author: tomasbjerre

build.gradle

@@ -19,7 +19,7 @@ apply from: project.buildscript.classLoader.getResource('release.gradle').toURI(
 
 
 dependencies {
- compile 'se.bjurr.violations:violation-comments-lib:1.75'
+ compile 'se.bjurr.violations:violation-comments-lib:1.79'
  compile 'com.jayway.jsonpath:json-path:2.0.0'
  compile 'com.google.code.gson:gson:2.8.0'
  compile 'com.google.guava:guava:20.0'

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/BitbucketServerCommentsProvider.java

@@ -16,6 +16,7 @@
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.BitbucketServerClient;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerComment;
 import se.bjurr.violations.comments.bitbucketserver.lib.client.model.BitbucketServerDiff;
@@ -29,7 +30,6 @@
 import se.bjurr.violations.comments.lib.ViolationsLogger;
 import se.bjurr.violations.comments.lib.model.ChangedFile;
 import se.bjurr.violations.comments.lib.model.Comment;
-import se.bjurr.violations.lib.util.Optional;
 
 public class BitbucketServerCommentsProvider implements CommentsProvider {
 

src/main/java/se/bjurr/violations/comments/bitbucketserver/lib/ViolationCommentsToBitbucketServerApi.java

@@ -1,18 +1,18 @@
 package se.bjurr.violations.comments.bitbucketserver.lib;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Optional.ofNullable;
 import static se.bjurr.violations.comments.lib.CommentsCreator.createComments;
-import static se.bjurr.violations.lib.util.Optional.fromNullable;
 import static se.bjurr.violations.lib.util.Utils.firstNonNull;
 import static se.bjurr.violations.lib.util.Utils.isNullOrEmpty;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import se.bjurr.violations.comments.lib.CommentsProvider;
 import se.bjurr.violations.comments.lib.ViolationsLogger;
 import se.bjurr.violations.lib.model.Violation;
-import se.bjurr.violations.lib.util.Optional;
 
 public class ViolationCommentsToBitbucketServerApi {
   private static final Integer BITBUCKET_MAX_COMMENT_SIZE = 32767;
@@ -310,6 +310,6 @@ public ViolationCommentsToBitbucketServerApi withCommentTemplate(final String co
   }
 
   public Optional<String> findCommentTemplate() {
-    return fromNullable(commentTemplate);
+    return ofNullable(commentTemplate);
   }
 }