You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by jm...@apache.org on 2023/01/06 11:31:15 UTC
[oozie] branch master updated: OOZIE-3696 [sharelib-git] Fix current SpotBugs discovered issues in Oozie's sharelib-git module (dionusos via jmakai)
This is an automated email from the ASF dual-hosted git repository.
jmakai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new a36bd2f8f OOZIE-3696 [sharelib-git] Fix current SpotBugs discovered issues in Oozie's sharelib-git module (dionusos via jmakai)
a36bd2f8f is described below
commit a36bd2f8fa5b471957242727876d8de9f2b317c2
Author: Janos Makai <jm...@apache.org>
AuthorDate: Fri Jan 6 12:30:20 2023 +0100
OOZIE-3696 [sharelib-git] Fix current SpotBugs discovered issues in Oozie's sharelib-git module (dionusos via jmakai)
---
release-log.txt | 1 +
.../java/org/apache/oozie/action/hadoop/GitOperations.java | 11 ++++-------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/release-log.txt b/release-log.txt
index d219195a0..2d84e0c8a 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.3.0 release (trunk - unreleased)
+OOZIE-3696 [sharelib-git] Fix current SpotBugs discovered issues in Oozie's sharelib-git module (dionusos via jmakai)
OOZIE-3689 Remove usage of commons-httpclient due to EOL (jmakai via dionusos)
OOZIE-3688 Introduce retry mechanism when starting embedded servlet containers in unit tests (jmakai via dionusos)
OOZIE-3685 Repair flaky testCoordActionInputCheckXCommandUniqueness unit test (jmakai via dionusos)
diff --git a/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitOperations.java b/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitOperations.java
index 35057902f..48983b21c 100644
--- a/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitOperations.java
+++ b/sharelib/git/src/main/java/org/apache/oozie/action/hadoop/GitOperations.java
@@ -92,13 +92,10 @@ class GitOperations {
final CloneCommand cloneCommand = Git.cloneRepository();
cloneCommand.setURI(srcURL.toString());
- if (srcURL.getScheme().toLowerCase().equals("ssh")) {
- cloneCommand.setTransportConfigCallback(new TransportConfigCallback() {
- @Override
- public void configure(final Transport transport) {
- final SshTransport sshTransport = (SshTransport)transport;
- sshTransport.setSshSessionFactory(sshSessionFactory);
- }
+ if ("ssh".equalsIgnoreCase(srcURL.getScheme())) {
+ cloneCommand.setTransportConfigCallback(transport -> {
+ final SshTransport sshTransport = (SshTransport)transport;
+ sshTransport.setSshSessionFactory(sshSessionFactory);
});
}