fix(webhooks): bitbucket server or cloud determination (#572)

Fixes the determination for bitbucket server or cloud webhooks, cleans up some erroneous code and fixes a typo

echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java

@@ -64,7 +64,7 @@ public void handle(Event event, Map postedEvent) {
 
     if (looksLikeBitbucketCloud(event)) {
       handleBitbucketCloudEvent(event, postedEvent);
-    } else if (lookLikeBitbucketServer(event)) {
+    } else if (looksLikeBitbucketServer(event)) {
       handleBitbucketServerEvent(event, postedEvent);
     }
 
@@ -103,28 +103,16 @@ public void handle(Event event, Map postedEvent) {
   }
 
   private boolean looksLikeBitbucketCloud(Event event) {
-    if (!event.content.containsKey("event_type")) {
-      return false;
-    }
-
     String eventType = event.content.get("event_type").toString();
-    return (eventType == "repo:push" || eventType == "pullrequest:fulfilled");
+    return (eventType.equals("repo:push") || eventType.equals("pullrequest:fulfilled"));
   }
 
-  private boolean lookLikeBitbucketServer(Event event) {
-    if (!event.content.containsKey("event_type")) {
-      return false;
-    }
-
+  private boolean looksLikeBitbucketServer(Event event) {
     String eventType = event.content.get("event_type").toString();
-    return (eventType == "repo:refs_changed" || eventType == "pr:merged");
+    return (eventType.equals("repo:refs_changed") || eventType.equals("pr:merged"));
   }
 
   private String getFullRepoName(Event event) {
-    if (!event.content.containsKey("event_type")) {
-      return "";
-    }
-
     if (looksLikeBitbucketCloud(event)) {
       return ((Map<String, Object>) event.content.get("repository")).get("full_name").toString();
     }