From 588870ca5f09b89b7ca7ca83801caf02c7e03f62 Mon Sep 17 00:00:00 2001 From: rlynch2 Date: Fri, 4 Nov 2016 13:04:57 -0700 Subject: [PATCH] Fixed codacy warnings/errors. --- .../server/environment/JGitEnvironmentRepository.java | 10 +++++----- .../environment/JGitEnvironmentRepositoryTests.java | 11 ++++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java index fc27e916..0cbba345 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java @@ -167,12 +167,12 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository try { git = createGitClient(); if (shouldPull(git)) { - fetch(git, label); - //checkout after fetch so we can get any new branches, tags, ect. + fetch(git, label);:wQ + //checkout after fetch so we can get any new branches, tags, ect. checkout(git, label); if(isBranch(git, label)) { - //merge results from fetch - merge(git, label); + //merge results from fetch + merge(git, label); if (!isClean(git)) { logger.warn("The local repository is dirty. Resetting it to origin/" + label + "."); @@ -181,7 +181,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository } } else{ - //nothing to update so just checkout + //nothing to update so just checkout checkout(git, label); } //always return what is currently HEAD as the version diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java index 9e7deabe..3cd66c5e 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java @@ -22,7 +22,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.eclipse.jgit.api.*; + +import org.eclipse.jgit.api.CheckoutCommand; +import org.eclipse.jgit.api.CloneCommand; +import org.eclipse.jgit.api.FetchCommand; +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.ListBranchCommand; +import org.eclipse.jgit.api.MergeCommand; +import org.eclipse.jgit.api.ResetCommand; +import org.eclipse.jgit.api.Status; +import org.eclipse.jgit.api.StatusCommand; import org.eclipse.jgit.api.errors.InvalidRemoteException; import org.eclipse.jgit.api.errors.NotMergedException; import org.eclipse.jgit.lib.ObjectId;