From 9cab223a6f7d810d7906255d663ec308aedbbdd0 Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Mon, 16 May 2022 17:32:15 -0700 Subject: [PATCH] Fix Sonar cloud flagged issues (#4987) --- .../catalog/jdbi3/EntityRepository.java | 2 +- .../catalog/jdbi3/MlModelRepository.java | 1 - .../catalog/jdbi3/UserRepository.java | 2 +- .../catalog/resources/EntityResource.java | 2 +- .../catalog/resources/feeds/FeedResource.java | 8 -------- .../resources/metrics/MetricsResource.java | 3 ++- .../resources/reports/ReportResource.java | 3 ++- .../database/DatabaseServiceResource.java | 18 ------------------ .../resources/config/ConfigResourceTest.java | 8 ++++---- .../resources/teams/UserResourceTest.java | 6 +++--- .../security/JWTTokenGeneratorTest.java | 2 +- 11 files changed, 15 insertions(+), 40 deletions(-) diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java index c3bcf615c6f..418afa9563b 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/EntityRepository.java @@ -763,7 +763,7 @@ public abstract class EntityRepository { from = toId; to = fromId; } - return daoCollection.relationshipDAO().insert(fromId, toId, fromEntity, toEntity, relationship.ordinal(), json); + return daoCollection.relationshipDAO().insert(from, to, fromEntity, toEntity, relationship.ordinal(), json); } public List findBoth(UUID entity1, String entityType1, Relationship relationship, String entity2) { diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MlModelRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MlModelRepository.java index dbcd6112b9a..33f8d3aae84 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MlModelRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/MlModelRepository.java @@ -31,7 +31,6 @@ import java.util.UUID; import lombok.extern.slf4j.Slf4j; import org.openmetadata.catalog.Entity; import org.openmetadata.catalog.entity.data.MlModel; -import org.openmetadata.catalog.jdbi3.EntityRepository.EntityUpdater; import org.openmetadata.catalog.resources.mlmodels.MlModelResource; import org.openmetadata.catalog.type.EntityReference; import org.openmetadata.catalog.type.Include; diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java index 3d8edf974c0..904449c3181 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java @@ -215,7 +215,7 @@ public class UserRepository extends EntityRepository { List teamIds = findFrom(user.getId(), Entity.USER, Relationship.HAS, Entity.TEAM); List teams = EntityUtil.populateEntityReferences(teamIds, Entity.TEAM); // return only the non-deleted teams - return teams.stream().filter((team) -> !team.getDeleted()).collect(Collectors.toList()); + return teams.stream().filter(team -> !team.getDeleted()).collect(Collectors.toList()); } private void assignRoles(User user, List roles) { diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/EntityResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/EntityResource.java index d755bd3c5e4..0a1998fa8c1 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/EntityResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/EntityResource.java @@ -34,7 +34,7 @@ public abstract class EntityResource entityClass, K repository, Authorizer authorizer) { + protected EntityResource(Class entityClass, K repository, Authorizer authorizer) { this.entityClass = entityClass; allowedFields = Entity.getAllowedFields(entityClass); supportsOwner = allowedFields.contains(FIELD_OWNER); diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java index 81ab94542c4..d5b4019db5c 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/feeds/FeedResource.java @@ -17,7 +17,6 @@ import static org.openmetadata.catalog.security.SecurityUtil.ADMIN; import static org.openmetadata.catalog.security.SecurityUtil.BOT; import static org.openmetadata.catalog.security.SecurityUtil.OWNER; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.ExternalDocumentation; import io.swagger.v3.oas.annotations.Operation; @@ -28,8 +27,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.responses.ApiResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -79,11 +76,6 @@ public class FeedResource { private final FeedRepository dao; private final Authorizer authorizer; - private static List getAllowedFields() { - JsonPropertyOrder propertyOrder = Thread.class.getAnnotation(JsonPropertyOrder.class); - return new ArrayList<>(Arrays.asList(propertyOrder.value())); - } - public static List addHref(UriInfo uriInfo, List threads) { threads.forEach(t -> addHref(uriInfo, t)); return threads; diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java index a0e232e026a..062696ce47a 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/metrics/MetricsResource.java @@ -15,6 +15,7 @@ package org.openmetadata.catalog.resources.metrics; import static org.openmetadata.catalog.security.SecurityUtil.ADMIN; import static org.openmetadata.catalog.security.SecurityUtil.BOT; +import static org.openmetadata.catalog.security.SecurityUtil.OWNER; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; @@ -173,7 +174,7 @@ public class MetricsResource extends EntityResource public Response createOrUpdate( @Context UriInfo uriInfo, @Context SecurityContext securityContext, @Valid Metrics metrics) throws IOException { addToMetrics(securityContext, metrics); - return createOrUpdate(uriInfo, securityContext, metrics); + return createOrUpdate(uriInfo, securityContext, metrics, ADMIN | BOT | OWNER); } private void addToMetrics(SecurityContext securityContext, Metrics metrics) { diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java index cfc69f8e13c..bd56a881da1 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/reports/ReportResource.java @@ -15,6 +15,7 @@ package org.openmetadata.catalog.resources.reports; import static org.openmetadata.catalog.security.SecurityUtil.ADMIN; import static org.openmetadata.catalog.security.SecurityUtil.BOT; +import static org.openmetadata.catalog.security.SecurityUtil.OWNER; import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation; @@ -165,7 +166,7 @@ public class ReportResource extends EntityResource { public Response createOrUpdate( @Context UriInfo uriInfo, @Context SecurityContext securityContext, @Valid Report report) throws IOException { addToReport(securityContext, report); - return createOrUpdate(uriInfo, securityContext, report); + return createOrUpdate(uriInfo, securityContext, report, ADMIN | BOT | OWNER); } private void addToReport(SecurityContext securityContext, Report report) { diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java index 2d687aec22b..e99a41f6d3d 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/services/database/DatabaseServiceResource.java @@ -47,9 +47,7 @@ import javax.ws.rs.core.SecurityContext; import javax.ws.rs.core.UriInfo; import org.openmetadata.catalog.Entity; import org.openmetadata.catalog.api.services.CreateDatabaseService; -import org.openmetadata.catalog.api.services.DatabaseConnection; import org.openmetadata.catalog.entity.services.DatabaseService; -import org.openmetadata.catalog.fernet.Fernet; import org.openmetadata.catalog.jdbi3.CollectionDAO; import org.openmetadata.catalog.jdbi3.DatabaseServiceRepository; import org.openmetadata.catalog.jdbi3.ListFilter; @@ -72,7 +70,6 @@ public class DatabaseServiceResource extends EntityResource { @@ -357,18 +353,4 @@ public class DatabaseServiceResource extends EntityResource clazz = Class.forName(clazzName); - JsonUtils.convertValue(connectionConfig, clazz); - } catch (Exception e) { - throw new RuntimeException( - String.format("Failed to construct connection instance of %s", databaseServiceType.value())); - } - } } diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/config/ConfigResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/config/ConfigResourceTest.java index 8d13d1b91c6..423e86c8879 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/config/ConfigResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/config/ConfigResourceTest.java @@ -79,11 +79,11 @@ class ConfigResourceTest extends CatalogApplicationTest { WebTarget target = getConfigResource("jwks"); JWKSResponse auth = TestUtils.get(target, JWKSResponse.class, TEST_AUTH_HEADERS); assertNotNull(auth); - assertEquals(auth.getJwsKeys().size(), 1); + assertEquals(1, auth.getJwsKeys().size()); JWKSKey jwksKey = auth.getJwsKeys().get(0); - assertEquals(jwksKey.getAlg(), "RS256"); - assertEquals(jwksKey.getUse(), "sig"); - assertEquals(jwksKey.getKty(), "RSA"); + assertEquals("RS256", jwksKey.getAlg()); + assertEquals("sig", jwksKey.getUse()); + assertEquals("RSA", jwksKey.getKty()); assertNotNull(jwksKey.getN()); assertNotNull(jwksKey.getE()); } diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/UserResourceTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/UserResourceTest.java index 90dc339b20b..436d38fe40d 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/UserResourceTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/teams/UserResourceTest.java @@ -694,13 +694,13 @@ public class UserResourceTest extends EntityResourceTest { Date date = jwt.getExpiresAt(); long daysBetween = ((date.getTime() - jwt.getIssuedAt().getTime()) / (1000 * 60 * 60 * 24)); assertTrue(daysBetween >= 6); - assertEquals(jwt.getClaims().get("sub").asString(), "ingestion-bot-jwt"); - assertEquals(jwt.getClaims().get("isBot").asBoolean(), true); + assertEquals("ingestion-bot-jwt", jwt.getClaims().get("sub").asString()); + assertEquals(true, jwt.getClaims().get("isBot").asBoolean()); TestUtils.put(getResource(String.format("users/revokeToken/%s", user.getId())), User.class, OK, ADMIN_AUTH_HEADERS); jwtAuthMechanism = TestUtils.get( getResource(String.format("users/token/%s", user.getId())), JWTAuthMechanism.class, ADMIN_AUTH_HEADERS); - assertEquals(jwtAuthMechanism.getJWTToken(), StringUtils.EMPTY); + assertEquals(StringUtils.EMPTY, jwtAuthMechanism.getJWTToken()); } private DecodedJWT decodedJWT(String token) throws MalformedURLException, JwkException, HttpResponseException { diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/security/JWTTokenGeneratorTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/security/JWTTokenGeneratorTest.java index d669a295a0e..b658a81216c 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/security/JWTTokenGeneratorTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/security/JWTTokenGeneratorTest.java @@ -53,7 +53,7 @@ public class JWTTokenGeneratorTest { .withDisplayName("ingestion-bot"); JWTAuthMechanism jwtAuthMechanism = jwtTokenGenerator.generateJWTToken(user, JWTTokenExpiry.Seven); DecodedJWT jwt = decodedJWT(jwtAuthMechanism.getJWTToken()); - assertEquals(jwt.getClaims().get("sub").asString(), "ingestion-bot"); + assertEquals("ingestion-bot", jwt.getClaims().get("sub").asString()); Date date = jwt.getExpiresAt(); long daysBetween = ((date.getTime() - jwt.getIssuedAt().getTime()) / (1000 * 60 * 60 * 24)); assertTrue(daysBetween >= 6);