yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-10 09:31:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'Use the primitive boolean expression' - warning (#7945)

Browse Source
This commit is contained in:
Semjon Nirmann 2022-10-04 22:34:00 +02:00 committed by GitHub
parent 7e38b38217
commit f9f951c44b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TeamRepository.java
View File

@ -247,7 +247,7 @@ public class TeamRepository extends EntityRepository<Team> {
List<Team> allTeams = resultList.getData(); List<Team> allTeams = resultList.getData();
List<Team> joinableTeams = List<Team> joinableTeams =
allTeams.stream() allTeams.stream()
.filter(isJoinable ? Team::getIsJoinable : t -> true) .filter(Boolean.TRUE.equals(isJoinable) ? Team::getIsJoinable : t -> true)
.filter(t -> !t.getName().equals(ORGANIZATION_NAME)) .filter(t -> !t.getName().equals(ORGANIZATION_NAME))
.collect(Collectors.toList()); .collect(Collectors.toList());
// build hierarchy of joinable teams // build hierarchy of joinable teams

2
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java
View File

@ -85,7 +85,7 @@ public class TestCaseRepository extends EntityRepository<TestCase> {
values.put(testCaseParameterValue.getName(), testCaseParameterValue.getValue()); values.put(testCaseParameterValue.getName(), testCaseParameterValue.getValue());
} }
for (TestCaseParameter parameter : parameterDefinition) { for (TestCaseParameter parameter : parameterDefinition) {
if (parameter.getRequired() if (Boolean.TRUE.equals(parameter.getRequired())
&& (!values.containsKey(parameter.getName()) || values.get(parameter.getName()) == null)) { && (!values.containsKey(parameter.getName()) || values.get(parameter.getName()) == null)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Required parameter " + parameter.getName() + " is not passed in parameterValues"); "Required parameter " + parameter.getName() + " is not passed in parameterValues");

4
openmetadata-service/src/main/java/org/openmetadata/service/resources/elasticSearch/BuildSearchIndexResource.java
View File

@ -266,7 +266,7 @@ public class BuildSearchIndexResource {
ElasticSearchIndexDefinition.ElasticSearchIndexType indexType = ElasticSearchIndexDefinition.ElasticSearchIndexType indexType =
elasticSearchIndexDefinition.getIndexMappingByEntityType(entityType); elasticSearchIndexDefinition.getIndexMappingByEntityType(entityType);
if (createRequest.getRecreateIndex()) { if (Boolean.TRUE.equals(createRequest.getRecreateIndex())) {
// Delete index // Delete index
elasticSearchIndexDefinition.deleteIndex(indexType); elasticSearchIndexDefinition.deleteIndex(indexType);
// Create index // Create index
@ -307,7 +307,7 @@ public class BuildSearchIndexResource {
ElasticSearchIndexDefinition.ElasticSearchIndexType indexType = ElasticSearchIndexDefinition.ElasticSearchIndexType indexType =
elasticSearchIndexDefinition.getIndexMappingByEntityType(entityType); elasticSearchIndexDefinition.getIndexMappingByEntityType(entityType);
if (createRequest.getRecreateIndex()) { if (Boolean.TRUE.equals(createRequest.getRecreateIndex())) {
// Delete index // Delete index
elasticSearchIndexDefinition.deleteIndex(indexType); elasticSearchIndexDefinition.deleteIndex(indexType);
// Create index // Create index

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

@ -788,9 +788,10 @@ public class UserResource extends EntityResource<User, UserRepository> {
@ApiResponse(responseCode = "400", description = "Bad request") @ApiResponse(responseCode = "400", description = "Bad request")
}) })
public Response registerNewUser(@Context UriInfo uriInfo, @Valid RegistrationRequest create) throws IOException { public Response registerNewUser(@Context UriInfo uriInfo, @Valid RegistrationRequest create) throws IOException {
if (ConfigurationHolder.getInstance() if (Boolean.TRUE.equals(
ConfigurationHolder.getInstance()
.getConfig(ConfigurationHolder.ConfigurationType.AUTHENTICATION_CONFIG, AuthenticationConfiguration.class) .getConfig(ConfigurationHolder.ConfigurationType.AUTHENTICATION_CONFIG, AuthenticationConfiguration.class)
.getEnableSelfSignup()) { .getEnableSelfSignup())) {
User registeredUser = registerUser(uriInfo, create); User registeredUser = registerUser(uriInfo, create);
if (isEmailServiceEnabled) { if (isEmailServiceEnabled) {
try { try {
@ -847,7 +848,7 @@ public class UserResource extends EntityResource<User, UserRepository> {
String user) String user)
throws IOException { throws IOException {
User registeredUser = dao.getByName(uriInfo, user, getFields("isEmailVerified")); User registeredUser = dao.getByName(uriInfo, user, getFields("isEmailVerified"));
if (registeredUser.getIsEmailVerified()) { if (Boolean.TRUE.equals(registeredUser.getIsEmailVerified())) {
// no need to do anything // no need to do anything
return Response.status(Response.Status.OK).entity("Email Already Verified For User.").build(); return Response.status(Response.Status.OK).entity("Email Already Verified For User.").build();
} }
@ -1100,7 +1101,7 @@ public class UserResource extends EntityResource<User, UserRepository> {
.build(); .build();
} }
if (storedUser != null && storedUser.getIsBot() != null && storedUser.getIsBot()) { if (storedUser != null && Boolean.TRUE.equals(storedUser.getIsBot())) {
return Response.status(BAD_REQUEST) return Response.status(BAD_REQUEST)
.entity(new ErrorMessage(BAD_REQUEST.getStatusCode(), INVALID_USERNAME_PASSWORD)) .entity(new ErrorMessage(BAD_REQUEST.getStatusCode(), INVALID_USERNAME_PASSWORD))
.build(); .build();
@ -1235,7 +1236,7 @@ public class UserResource extends EntityResource<User, UserRepository> {
} }
User registeredUser = User registeredUser =
dao.get(uriInfo, emailVerificationToken.getUserId(), userRepository.getFieldsWithUserAuth("*")); dao.get(uriInfo, emailVerificationToken.getUserId(), userRepository.getFieldsWithUserAuth("*"));
if (registeredUser.getIsEmailVerified()) { if (Boolean.TRUE.equals(registeredUser.getIsEmailVerified())) {
LOG.info("User [{}] already registered.", emailToken); LOG.info("User [{}] already registered.", emailToken);
return; return;
} }
@ -1259,7 +1260,7 @@ public class UserResource extends EntityResource<User, UserRepository> {
public User extendRegistrationToken(UriInfo uriInfo, String existingToken) throws IOException { public User extendRegistrationToken(UriInfo uriInfo, String existingToken) throws IOException {
EmailVerificationToken emailVerificationToken = (EmailVerificationToken) tokenRepository.findByToken(existingToken); EmailVerificationToken emailVerificationToken = (EmailVerificationToken) tokenRepository.findByToken(existingToken);
User registeredUser = dao.get(uriInfo, emailVerificationToken.getUserId(), getFields("isEmailVerified")); User registeredUser = dao.get(uriInfo, emailVerificationToken.getUserId(), getFields("isEmailVerified"));
if (registeredUser.getIsEmailVerified()) { if (Boolean.TRUE.equals(registeredUser.getIsEmailVerified())) {
// no need to do anything // no need to do anything
return registeredUser; return registeredUser;
} }
@ -1400,7 +1401,7 @@ public class UserResource extends EntityResource<User, UserRepository> {
throw new RuntimeException( throw new RuntimeException(
"Password Reset Token" + token.getToken() + "Expired token. Please issue a new request"); "Password Reset Token" + token.getToken() + "Expired token. Please issue a new request");
} }
if (!token.getIsActive()) { if (Boolean.FALSE.equals(token.getIsActive())) {
throw new RuntimeException("Password Reset Token" + token.getToken() + "Token was marked inactive"); throw new RuntimeException("Password Reset Token" + token.getToken() + "Token was marked inactive");
} }
} }

2
openmetadata-service/src/main/java/org/openmetadata/service/security/JwtFilter.java
View File

@ -135,7 +135,7 @@ public class JwtFilter implements ContainerRequestFilter {
String userName = validateAndReturnUsername(claims); String userName = validateAndReturnUsername(claims);
// validate bot token // validate bot token
if (claims.containsKey(BOT_CLAIM) && claims.get(BOT_CLAIM).asBoolean()) { if (claims.containsKey(BOT_CLAIM) && Boolean.TRUE.equals(claims.get(BOT_CLAIM).asBoolean())) {
validateBotToken(tokenFromHeader, userName); validateBotToken(tokenFromHeader, userName);
} }