Merging if statements (#7851)

openmetadata-service/src/main/java/org/openmetadata/service/events/AbstractEventPublisher.java

@@ -50,11 +50,9 @@ public abstract class AbstractEventPublisher implements EventPublisher {
       throws Exception {
     // Ignore events that don't match the webhook event filters
     ChangeEvent changeEvent = changeEventHolder.get();
-    if (!filter.isEmpty()) {
+    if (!filter.isEmpty() && !FilterUtil.shouldProcessRequest(changeEvent, filter)) {
-      if (!FilterUtil.shouldProcessRequest(changeEvent, filter)) {
       return;
     }
-    }
 
     // Batch until either the batch has ended or batch size has reached the max size
     batch.add(changeEventHolder.get());

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java

@@ -967,11 +967,9 @@ public interface CollectionDAO {
         return listAnnouncementsByEntityLinkBefore(
             fqnPrefix, toType, limit, before, type, relation, mysqlCondition, postgresCondition);
       }
-      if (userName != null) {
+      if (userName != null && filterType == FilterType.MENTIONS) {
-        if (filterType == FilterType.MENTIONS) {
         filterRelation = Relationship.MENTIONED_IN.ordinal();
       }
-      }
       return listThreadsByEntityLinkBefore(
           fqnPrefix, toType, limit, before, type, status, resolved, relation, userName, teamNames, filterRelation);
     }
@@ -1058,11 +1056,9 @@ public interface CollectionDAO {
         return listAnnouncementsByEntityLinkAfter(
             fqnPrefix, toType, limit, after, type, relation, mysqlCondition, postgresCondition);
       }
-      if (userName != null) {
+      if (userName != null && filterType == FilterType.MENTIONS) {
-        if (filterType == FilterType.MENTIONS) {
         filterRelation = Relationship.MENTIONED_IN.ordinal();
       }
-      }
       return listThreadsByEntityLinkAfter(
           fqnPrefix, toType, limit, after, type, status, resolved, relation, userName, teamNames, filterRelation);
     }
@@ -1146,11 +1142,9 @@ public interface CollectionDAO {
         }
         return listCountAnnouncementsByEntityLink(fqnPrefix, toType, type, relation, mysqlCondition, postgresCondition);
       }
-      if (userName != null) {
+      if (userName != null && filterType == FilterType.MENTIONS) {
-        if (filterType == FilterType.MENTIONS) {
         filterRelation = Relationship.MENTIONED_IN.ordinal();
       }
-      }
       return listCountThreadsByEntityLink(
           fqnPrefix, toType, type, status, resolved, relation, userName, teamNames, filterRelation);
     }

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java

@@ -1221,13 +1221,12 @@ public abstract class EntityRepository<T extends EntityInterface> {
     private void updateOwner() throws JsonProcessingException {
       EntityReference origOwner = original.getOwner();
       EntityReference updatedOwner = updated.getOwner();
-      if (operation.isPatch() || updatedOwner != null) {
+      if ((operation.isPatch() || updatedOwner != null)
+          && recordChange(FIELD_OWNER, origOwner, updatedOwner, true, entityReferenceMatch)) {
         // Update owner for all PATCH operations. For PUT operations, ownership can't be removed
-        if (recordChange(FIELD_OWNER, origOwner, updatedOwner, true, entityReferenceMatch)) {
         EntityRepository.this.updateOwner(original, origOwner, updatedOwner);
       }
     }
-    }
 
     protected void updateTags(String fqn, String fieldName, List<TagLabel> origTags, List<TagLabel> updatedTags)
         throws IOException {

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java

@@ -1053,23 +1053,23 @@ public class TableRepository extends EntityRepository<Table> {
     private void updateColumnPrecision(Column origColumn, Column updatedColumn) throws JsonProcessingException {
       String columnField = getColumnField(original, origColumn, "precision");
       boolean updated = recordChange(columnField, origColumn.getPrecision(), updatedColumn.getPrecision());
-      if (origColumn.getPrecision() != null) { // Previously precision was set
+      if (origColumn.getPrecision() != null
-        if (updated && updatedColumn.getPrecision() < origColumn.getPrecision()) {
+          && updated
+          && updatedColumn.getPrecision() < origColumn.getPrecision()) { // Previously precision was set
         // The precision was reduced. Treat it as backward-incompatible change
         majorVersionChange = true;
       }
     }
-    }
 
     private void updateColumnScale(Column origColumn, Column updatedColumn) throws JsonProcessingException {
       String columnField = getColumnField(original, origColumn, "scale");
       boolean updated = recordChange(columnField, origColumn.getScale(), updatedColumn.getScale());
-      if (origColumn.getScale() != null) { // Previously scale was set
+      if (origColumn.getScale() != null
-        if (updated && updatedColumn.getScale() < origColumn.getScale()) {
+          && updated
+          && updatedColumn.getScale() < origColumn.getScale()) { // Previously scale was set
         // The scale was reduced. Treat it as backward-incompatible change
         majorVersionChange = true;
       }
     }
   }
 }
-}

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/UserRepository.java

@@ -349,11 +349,11 @@ public class UserRepository extends EntityRepository<User> {
       AuthenticationMechanism updatedAuthMechanism = updated.getAuthenticationMechanism();
       if (origAuthMechanism == null && updatedAuthMechanism != null) {
         recordChange("authenticationMechanism", original.getAuthenticationMechanism(), "new-encrypted-value");
-      } else if (origAuthMechanism != null && updatedAuthMechanism != null) {
+      } else if (origAuthMechanism != null
-        if (!JsonUtils.areEquals(origAuthMechanism, updatedAuthMechanism)) {
+          && updatedAuthMechanism != null
+          && !JsonUtils.areEquals(origAuthMechanism, updatedAuthMechanism)) {
         recordChange("authenticationMechanism", "old-encrypted-value", "new-encrypted-value");
       }
     }
   }
 }
-}

openmetadata-service/src/main/java/org/openmetadata/service/resources/teams/UserResource.java

@@ -426,12 +426,10 @@ public class UserResource extends EntityResource<User, UserRepository> {
                 .withUsername(securityContext.getUserPrincipal().getName())
                 .withToken(request.getToken())
                 .withLogoutTime(logoutTime));
-    if (isBasicAuth()) {
+    if (isBasicAuth() && request.getRefreshToken() != null) {
       // need to clear the refresh token as well
-      if (request.getRefreshToken() != null) {
       tokenRepository.deleteToken(request.getRefreshToken());
     }
-    }
     return Response.status(200).entity("Logout Successful").build();
   }
 
@@ -1441,9 +1439,10 @@ public class UserResource extends EntityResource<User, UserRepository> {
     String botName = create.getBotName();
     EntityInterface bot = retrieveBot(botName);
     // check if the bot user exists
-    if (!botHasRelationshipWithUser(bot, original)) {
+    if (!botHasRelationshipWithUser(bot, original)
+        && original != null
+        && userHasRelationshipWithAnyBot(original, bot)) {
       // throw an exception if user already has a relationship with a bot
-      if (original != null && userHasRelationshipWithAnyBot(original, bot)) {
       List<CollectionDAO.EntityRelationshipRecord> userBotRelationship = retrieveBotRelationshipsFor(original);
       bot =
           Entity.getEntityRepository(Entity.BOT)
@@ -1451,7 +1450,6 @@ public class UserResource extends EntityResource<User, UserRepository> {
       throw new IllegalArgumentException(
           String.format("Bot user [%s] is already used by [%s] bot.", user.getName(), bot.getName()));
     }
-    }
     addAuthMechanismToBot(user, create, uriInfo);
     RestUtil.PutResponse<User> response = dao.createOrUpdate(uriInfo, user);
     decryptOrNullify(securityContext, response.getEntity());

openmetadata-service/src/main/java/org/openmetadata/service/security/JwtFilter.java

@@ -201,12 +201,10 @@ public class JwtFilter implements ContainerRequestFilter {
     }
 
     // validate principal domain
-    if (enforcePrincipalDomain) {
+    if (enforcePrincipalDomain && !domain.equals(principalDomain)) {
-      if (!domain.equals(principalDomain)) {
       throw new AuthenticationException(
           String.format("Not Authorized! Email does not match the principal domain %s", principalDomain));
     }
-    }
     return userName;
   }
 

openmetadata-service/src/main/java/org/openmetadata/service/security/policyevaluator/CompiledRule.java

@@ -132,14 +132,12 @@ public class CompiledRule extends Rule {
     Iterator<MetadataOperation> iterator = operationContext.getOperations().listIterator();
     while (iterator.hasNext()) {
       MetadataOperation operation = iterator.next();
-      if (matchOperation(operation)) {
+      if (matchOperation(operation) && matchExpression(policyContext, subjectContext, resourceContext)) {
-        if (matchExpression(policyContext, subjectContext, resourceContext)) {
         LOG.info("operation {} allowed", operation);
         iterator.remove();
       }
     }
   }
-  }
 
   public void setPermission(Map<String, ResourcePermission> resourcePermissionMap, PolicyContext policyContext) {
     for (ResourcePermission resourcePermission : resourcePermissionMap.values()) {
@@ -154,8 +152,7 @@ public class CompiledRule extends Rule {
     Access access = getAccess();
     // Walk through all the operations in the rule and set permissions
     for (Permission permission : resourcePermission.getPermissions()) {
-      if (matchOperation(permission.getOperation())) {
+      if (matchOperation(permission.getOperation()) && overrideAccess(access, permission.getAccess())) {
-        if (overrideAccess(access, permission.getAccess())) {
         permission
             .withAccess(access)
             .withRole(policyContext.getRoleName())
@@ -165,7 +162,6 @@ public class CompiledRule extends Rule {
       }
     }
   }
-  }
 
   public void setPermission(
       SubjectContext subjectContext,

openmetadata-service/src/main/java/org/openmetadata/service/util/ElasticSearchClientUtils.java

@@ -62,8 +62,8 @@ public final class ElasticSearchClientUtils {
   private static SSLContext createSSLContext(ElasticSearchConfiguration elasticSearchConfiguration)
       throws KeyStoreException {
 
-    if (elasticSearchConfiguration.getScheme().equals("https")) {
+    if (elasticSearchConfiguration.getScheme().equals("https")
-      if (elasticSearchConfiguration.getTruststorePath() != null
+        && elasticSearchConfiguration.getTruststorePath() != null
         && !elasticSearchConfiguration.getTruststorePath().isEmpty()) {
       Path trustStorePath = Paths.get(elasticSearchConfiguration.getTruststorePath());
       KeyStore truststore = KeyStore.getInstance("jks");
@@ -79,7 +79,6 @@ public final class ElasticSearchClientUtils {
         throw new RuntimeException("Failed to crete SSLContext to for ElasticSearch Client", e);
       }
     }
-    }
     return null;
   }
 }