Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable PMD rule to prevent == string comparisons #20080

Merged
merged 1 commit into from
Dec 5, 2022
Merged

Enable PMD rule to prevent == string comparisons #20080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .../io/airbyte/db/instance/jobs/migrations/V0_35_40_001__MigrateFailureReasonEnumValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import org.jooq.DSLContext;
Expand Down Expand Up @@ -322,14 +323,14 @@ public boolean equals(final Object other) {
return false;
}
final FailureReasonForMigration rhs = ((FailureReasonForMigration) other);
return (((((((((this.retryable == rhs.retryable) || ((this.retryable != null) && this.retryable.equals(rhs.retryable)))
&& ((this.metadata == rhs.metadata) || ((this.metadata != null) && this.metadata.equals(rhs.metadata))))
&& ((this.stacktrace == rhs.stacktrace) || ((this.stacktrace != null) && this.stacktrace.equals(rhs.stacktrace))))
&& ((this.failureOrigin == rhs.failureOrigin) || ((this.failureOrigin != null) && this.failureOrigin.equals(rhs.failureOrigin))))
&& ((this.failureType == rhs.failureType) || ((this.failureType != null) && this.failureType.equals(rhs.failureType))))
&& ((this.internalMessage == rhs.internalMessage) || ((this.internalMessage != null) && this.internalMessage.equals(rhs.internalMessage))))
&& ((this.externalMessage == rhs.externalMessage) || ((this.externalMessage != null) && this.externalMessage.equals(rhs.externalMessage))))
&& ((this.timestamp == rhs.timestamp) || ((this.timestamp != null) && this.timestamp.equals(rhs.timestamp))));
return ((((((((Objects.equals(this.retryable, rhs.retryable))
&& (Objects.equals(this.metadata, rhs.metadata)))
&& (Objects.equals(this.stacktrace, rhs.stacktrace)))
&& (Objects.equals(this.failureOrigin, rhs.failureOrigin)))
&& (Objects.equals(this.failureType, rhs.failureType)))
&& (Objects.equals(this.internalMessage, rhs.internalMessage)))
&& (Objects.equals(this.externalMessage, rhs.externalMessage)))
&& (Objects.equals(this.timestamp, rhs.timestamp)));
}

}
Expand Down
12 changes: 6 additions & 6 deletions ...yte-persistence/job-persistence/src/main/java/io/airbyte/persistence/job/JobNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ private void notifyJob(final String reason,
try {
final Builder<String, Object> notificationMetadata = ImmutableMap.builder();
notificationMetadata.put("connection_id", connectionId);
if (notification.getNotificationType().equals(NotificationType.SLACK) &&
if (NotificationType.SLACK.equals(notification.getNotificationType()) &&
notification.getSlackConfiguration().getWebhook().contains("hooks.slack.com")) {
// flag as slack if the webhook URL is also pointing to slack
notificationMetadata.put("notification_type", NotificationType.SLACK);
} else if (notification.getNotificationType().equals(NotificationType.CUSTOMERIO)) {
} else if (NotificationType.CUSTOMERIO.equals(notification.getNotificationType())) {
notificationMetadata.put("notification_type", NotificationType.CUSTOMERIO);
} else {
// Slack Notification type could be "hacked" and re-used for custom webhooks
Expand All @@ -103,23 +103,23 @@ private void notifyJob(final String reason,
action,
MoreMaps.merge(jobMetadata, sourceMetadata, destinationMetadata, notificationMetadata.build()));

if (FAILURE_NOTIFICATION == action) {
if (FAILURE_NOTIFICATION.equalsIgnoreCase(action)) {
if (!notificationClient.notifyJobFailure(sourceConnector, destinationConnector, jobDescription, logUrl, job.getId())) {
LOGGER.warn("Failed to successfully notify failure: {}", notification);
}
break;
} else if (SUCCESS_NOTIFICATION == action) {
} else if (SUCCESS_NOTIFICATION.equalsIgnoreCase(action)) {
if (!notificationClient.notifyJobSuccess(sourceConnector, destinationConnector, jobDescription, logUrl, job.getId())) {
LOGGER.warn("Failed to successfully notify success: {}", notification);
}
break;
} else if (CONNECTION_DISABLED_NOTIFICATION == action) {
} else if (CONNECTION_DISABLED_NOTIFICATION.equalsIgnoreCase(action)) {
if (!notificationClient.notifyConnectionDisabled(workspace.getEmail(), sourceConnector, destinationConnector, jobDescription,
workspaceId, connectionId)) {
LOGGER.warn("Failed to successfully notify auto-disable connection: {}", notification);
}
break;
} else if (CONNECTION_DISABLED_WARNING_NOTIFICATION == action) {
} else if (CONNECTION_DISABLED_WARNING_NOTIFICATION.equalsIgnoreCase(action)) {
if (!notificationClient.notifyConnectionDisableWarning(workspace.getEmail(), sourceConnector, destinationConnector, jobDescription,
workspaceId, connectionId)) {
LOGGER.warn("Failed to successfully notify auto-disable connection warning: {}", notification);
Expand Down
10 changes: 5 additions & 5 deletions ...yte-server/src/test/java/io/airbyte/server/handlers/WebBackendConnectionsHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ void testWebBackendGetConnectionWithDiscoveryAndNewSchema() throws ConfigNotFoun
when(configRepository.getMostRecentActorCatalogFetchEventForSource(any()))
.thenReturn(Optional.of(new ActorCatalogFetchEvent().withActorCatalogId(newCatalogId)));
when(configRepository.getActorCatalogById(any())).thenReturn(new ActorCatalog().withId(UUID.randomUUID()));
SourceDiscoverSchemaRead schemaRead =
final SourceDiscoverSchemaRead schemaRead =
new SourceDiscoverSchemaRead().catalogDiff(expectedWithNewSchema.getCatalogDiff()).catalog(expectedWithNewSchema.getSyncCatalog())
.breakingChange(false).connectionStatus(ConnectionStatus.ACTIVE);
when(schedulerHandler.discoverSchemaForSourceFromSourceId(any())).thenReturn(schemaRead);
Expand All @@ -435,7 +435,7 @@ void testWebBackendGetConnectionWithDiscoveryAndNewSchemaBreakingChange() throws
when(configRepository.getMostRecentActorCatalogFetchEventForSource(any()))
.thenReturn(Optional.of(new ActorCatalogFetchEvent().withActorCatalogId(newCatalogId)));
when(configRepository.getActorCatalogById(any())).thenReturn(new ActorCatalog().withId(UUID.randomUUID()));
SourceDiscoverSchemaRead schemaRead =
final SourceDiscoverSchemaRead schemaRead =
new SourceDiscoverSchemaRead().catalogDiff(expectedWithNewSchema.getCatalogDiff()).catalog(expectedWithNewSchema.getSyncCatalog())
.breakingChange(true).connectionStatus(ConnectionStatus.INACTIVE);
when(schedulerHandler.discoverSchemaForSourceFromSourceId(any())).thenReturn(schemaRead);
Expand Down Expand Up @@ -1163,13 +1163,13 @@ void testGetStreamsToReset() {
final List<StreamDescriptor> resultList = WebBackendConnectionsHandler.getStreamsToReset(catalogDiff);
assertTrue(
resultList.stream().anyMatch(
streamDescriptor -> streamDescriptor.getName() == "added_stream"));
streamDescriptor -> "added_stream".equalsIgnoreCase(streamDescriptor.getName())));
assertTrue(
resultList.stream().anyMatch(
streamDescriptor -> streamDescriptor.getName() == "removed_stream"));
streamDescriptor -> "removed_stream".equalsIgnoreCase(streamDescriptor.getName())));
assertTrue(
resultList.stream().anyMatch(
streamDescriptor -> streamDescriptor.getName() == "updated_stream"));
streamDescriptor -> "updated_stream".equalsIgnoreCase(streamDescriptor.getName())));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...acceptanceTests/java/io/airbyte/test/acceptance/ContainerOrchestratorAcceptanceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -101,7 +100,8 @@ static void end() {
void setup() throws URISyntaxException, IOException, SQLException {
testHarness.setup();
}
// This test is flaky. Warnings are suppressed until that condition us understood

// This test is flaky. Warnings are suppressed until that condition us understood
// See: https://github.com/airbytehq/airbyte/issues/19948
@Test
@SuppressWarnings("PMD.JUnitTestsShouldIncludeAssert")
Expand Down
1 change: 0 additions & 1 deletion tools/gradle/pmd/rules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
<exclude name="ReturnEmptyCollectionRatherThanNull"/>
<exclude name="SimpleDateFormatNeedsLocale"/>
<exclude name="SingletonClassReturningNewInstance"/>
<exclude name="UseEqualsToCompareStrings"/>
<exclude name="UseProperClassLoader"/>
</rule>
<rule ref="category/java/errorprone.xml/AssignmentInOperand">
Expand Down