Skip to content

chore: reuse existing methods to reduce code duplication #1442

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: reuse existing methods to reduce code duplication #1442

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
12 changes: 5 additions & 7 deletions wrapper/src/main/java/software/amazon/jdbc/plugin/bluegreen/BlueGreenStatusMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,17 +532,15 @@
this.panicMode.set(true);

this.openConnectionFuture = openConnectionExecutorService.submit(() -> {

HostSpec connectionHostSpecCopy = this.connectionHostSpec.get();
String connectedIpAddressCopy = this.connectedIpAddress.get();

if (connectionHostSpecCopy == null) {
if (this.connectionHostSpec == null) {

Check warning on line 535 in wrapper/src/main/java/software/amazon/jdbc/plugin/bluegreen/BlueGreenStatusMonitor.java

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Constant values 

Condition `this.connectionHostSpec == null` is always `false`
this.connectionHostSpec.set(this.initialHostSpec);
connectionHostSpecCopy = this.initialHostSpec;
this.connectedIpAddress.set(null);
connectedIpAddressCopy = null;
this.connectionHostSpecCorrect.set(false);
}

HostSpec connectionHostSpecCopy = this.connectionHostSpec.get();
String connectedIpAddressCopy = this.connectedIpAddress.get();

try {

if (this.useIpAddress.get() && connectedIpAddressCopy != null) {
Expand Down
6 changes: 1 addition & 5 deletions wrapper/src/main/java/software/amazon/jdbc/plugin/bluegreen/BlueGreenStatusProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,11 +905,7 @@ protected void registerIamHost(String connectHost, String iamHost) {

boolean differentNodeNames = connectHost != null && !connectHost.equals(iamHost);
if (differentNodeNames) {
boolean alreadyChangedName = this.iamHostSuccessfulConnects
.computeIfAbsent(connectHost, (key) -> ConcurrentHashMap.newKeySet())
.contains(iamHost);

if (!alreadyChangedName) {
if (!isAlreadySuccessfullyConnected(connectHost, iamHost)) {
this.greenNodeChangeNameTimes.computeIfAbsent(connectHost, (key) -> Instant.now());
LOGGER.finest(() -> Messages.get("bgd.greenNodeChangedName", new Object[] {connectHost, iamHost}));
}
Expand Down
Loading