From 836e48c895719ea42b53cb5b79f54dd1f9d5546b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 3 Nov 2020 09:58:55 +0100 Subject: [PATCH] Remove deprecated api calls --- .../sonia/scm/web/GitUserAgentProvider.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java index c910ed8053..e93c5a3ecc 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitUserAgentProvider.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.web; //~--- non-JDK imports -------------------------------------------------------- @@ -40,23 +40,21 @@ import sonia.scm.plugin.Extension; */ @Extension public class GitUserAgentProvider implements UserAgentProvider { - + private static final String PREFIX_JGIT = "jgit/"; @VisibleForTesting static final UserAgent JGIT = UserAgent.scmClient("JGit") - .browser(false) .basicAuthenticationCharset(Charsets.UTF_8) .build(); - + private static final String PREFIX_REGULAR = "git/"; - + @VisibleForTesting static final UserAgent GIT = UserAgent.scmClient("Git") - .browser(false) .basicAuthenticationCharset(Charsets.UTF_8) .build(); - + private static final String PREFIX_LFS = "git-lfs/"; @VisibleForTesting @@ -65,7 +63,7 @@ public class GitUserAgentProvider implements UserAgentProvider { .build(); private static final String SUFFIX_MSYSGIT = "msysgit"; - + @VisibleForTesting static final UserAgent MSYSGIT = UserAgent.scmClient("msysGit") .basicAuthenticationCharset(Charsets.UTF_8) @@ -78,7 +76,7 @@ public class GitUserAgentProvider implements UserAgentProvider { @Override public UserAgent parseUserAgent(String userAgentString) { String lowerUserAgent = toLower(userAgentString); - + if (isJGit(lowerUserAgent)) { return JGIT; } else if (isMsysGit(lowerUserAgent)) { @@ -91,23 +89,23 @@ public class GitUserAgentProvider implements UserAgentProvider { return null; } } - + private String toLower(String value) { return Strings.nullToEmpty(value).toLowerCase(Locale.ENGLISH); } - + private boolean isJGit(String userAgent) { return userAgent.startsWith(PREFIX_JGIT); } - + private boolean isMsysGit(String userAgent) { return userAgent.startsWith(PREFIX_REGULAR) && userAgent.contains(SUFFIX_MSYSGIT); } - + private boolean isGitLFS(String userAgent) { return userAgent.startsWith(PREFIX_LFS); } - + private boolean isGit(String userAgent) { return userAgent.startsWith(PREFIX_REGULAR); }