diff --git a/git-hook/src/com/verigreen/hook/BranchOperator.java b/git-hook/src/com/verigreen/hook/BranchOperator.java index 46c3029..3c29836 100644 --- a/git-hook/src/com/verigreen/hook/BranchOperator.java +++ b/git-hook/src/com/verigreen/hook/BranchOperator.java @@ -99,7 +99,7 @@ private VerigreenNeeded checkIfVerigreenNeeded( String newrev, String committer) { - VerigreenNeeded ret = null; + VerigreenNeeded ret; String vgBranchName = VerigreenUtils.getVerigreenBranchName(newrev); try { RestClientResponse clientResponse = diff --git a/verigreen-collector-api/src/com/verigreen/jgit/JGitOperator.java b/verigreen-collector-api/src/com/verigreen/jgit/JGitOperator.java index be16423..4f1f02e 100644 --- a/verigreen-collector-api/src/com/verigreen/jgit/JGitOperator.java +++ b/verigreen-collector-api/src/com/verigreen/jgit/JGitOperator.java @@ -96,7 +96,7 @@ public void setEmail_Address(String email_Address) { @Override public String createBranch(String commitId, String branchName) { - Ref result = null; + Ref result; CreateBranchCommand branchCreate = _git.branchCreate(); branchCreate.setName(branchName); branchCreate.setStartPoint(commitId); @@ -114,7 +114,7 @@ public String createBranch(String commitId, String branchName) { public RevCommit getRevCommit(String commitId) { - RevCommit ret = null; + RevCommit ret; RevWalk walk = new RevWalk(_repo); try { ret = walk.parseCommit(_repo.resolve(commitId)); @@ -129,7 +129,7 @@ public RevCommit getRevCommit(String commitId) { public Ref getRef(String ref) { - Ref ans = null; + Ref ans; try { ans = _repo.getRef(ref); } catch (Throwable e) { @@ -145,7 +145,7 @@ public String fetch(String localBranchName, String remoteBranchName) { RefSpec spec = new RefSpec().setSourceDestination(localBranchName, remoteBranchName); FetchCommand command = _git.fetch(); command.setRefSpecs(spec); - FetchResult result = null; + FetchResult result; try { result = command.call(); } catch (Throwable e) { @@ -181,7 +181,7 @@ public String checkout( if (useBranchNameAsStartPoint) { command.setStartPoint(REFS_REMOTES + branchName); } - Ref ref = null; + Ref ref; try { ref = command.call(); } catch (Throwable e) { @@ -203,7 +203,7 @@ public String checkout(String branchName, boolean createBranchIfNotExists, boole public boolean rebase(String upStreamBranchName) { RebaseCommand command = _git.rebase(); - RebaseResult result = null; + RebaseResult result; try { command.setUpstream(upStreamBranchName); result = command.call(); @@ -385,7 +385,7 @@ public void add(String itemToAdd) { @Override public String commit(String author, String email, String message) { - RevCommit revCommit = null; + RevCommit revCommit; CommitCommand command = _git.commit(); command.setCommitter(author, email); command.setMessage(message); diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java index 015ecb0..2dacc69 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java @@ -133,7 +133,7 @@ public static void triggerJob(CommitItem commitItem) { public static String getBuildUrl(int buildNumber) { - String buildUrl = null; + String buildUrl; buildUrl = job2Verify.getUrl()+Integer.toString(buildNumber)+"/"; return buildUrl; diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/EmailSender.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/EmailSender.java index 92b4f6c..58793ef 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/EmailSender.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/EmailSender.java @@ -102,7 +102,7 @@ public void notifyCommiter( String protectedBranch, String parentCommitId, String tempBranch){ - String link = ""; + String link; StringBuilder status = new StringBuilder(); @@ -195,7 +195,7 @@ protected void send(String subject, String messageText, String[] recipients, Str } } private String checkVerificationStatus(VerificationStatus result){ - String property = ""; + String property; String link = ""; if(_offlineMode.equals("false")) { diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java index a9f2355..66d0305 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java @@ -87,7 +87,7 @@ private VerigreenNeededLogic(String protectedBranches, String permittedUsers, St @SuppressWarnings("unchecked") private void getHistory() throws IOException { - StringBuilder stringBuilder = null; + StringBuilder stringBuilder; JSONArray keyValues; List values; if (!new File(historyJsonPath).exists()){ diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/Watchdir.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/Watchdir.java index 5188c46..02a1158 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/Watchdir.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/Watchdir.java @@ -33,7 +33,7 @@ public class Watchdir implements Runnable{ @Override public void run() { - FileReader reader = null; + FileReader reader; Properties properties = new Properties(); for(;;){ diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/decision/decisionmaker/ProtectedBranchesDecisionMaker.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/decision/decisionmaker/ProtectedBranchesDecisionMaker.java index 3082c2b..69d5e04 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/decision/decisionmaker/ProtectedBranchesDecisionMaker.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/decision/decisionmaker/ProtectedBranchesDecisionMaker.java @@ -34,7 +34,7 @@ public class ProtectedBranchesDecisionMaker { public Collection> decide() { Collection> ret = new ArrayList<>(); - CommitItem item = null; + CommitItem item; try { ArrayList notStarted = new ArrayList(CommitItemUtils.filterItems(CommitItemUtils.getNotDone(), VerificationStatus.NOT_STARTED)); Collection notDone = CommitItemUtils.getNotDone(); diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java index dbc9d4a..f538783 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java @@ -63,10 +63,10 @@ private void deleteBranches() { private List branchesToBeDelete(List branchesList){ List result = new ArrayList(); - Repository repo = null; + Repository repo; Map> branchesMap = new HashMap>(); for (String branch : branchesList) { - List values = null; + List values; if (!branchesMap.containsKey(branch.subSequence(0, 10))){ values = new ArrayList(); values.add(branch); diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/CallJenkinsJob.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/CallJenkinsJob.java index f4b5c0c..4e40e72 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/CallJenkinsJob.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/CallJenkinsJob.java @@ -178,7 +178,7 @@ private Map parsingJSON(String json) throws JSONException JsonParser parser = new JsonParser(); JsonObject mainJson = (JsonObject) parser.parse(json); - JsonObject parameterJsonObjectArray = null; + JsonObject parameterJsonObjectArray; JsonArray jsonBuildsArray = mainJson.getAsJsonArray("builds"); for (int i = 0; i < jsonBuildsArray.size(); i++) diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/BranchResource.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/BranchResource.java index ef14580..b09e4f7 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/BranchResource.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/BranchResource.java @@ -48,7 +48,7 @@ public class BranchResource { public Response post(BranchDescriptor branch, @QueryParam("password") String password) { - CommitItem commitItem = null; + CommitItem commitItem; if (password == null || password.isEmpty()){ commitItem = findCommitItem(branch); if (commitItem == null){ diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/CommitItemResource.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/CommitItemResource.java index 53d7842..ea81588 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/CommitItemResource.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/rest/CommitItemResource.java @@ -40,7 +40,7 @@ public Response get( @QueryParam("branchId") final String branchId, @QueryParam("commitId") final String commitId) { - Response ret = null; + Response ret; if ((protectedBranch == null) && (branchId == null)) { ret = getAllCommits(); } else { diff --git a/verigreen-collector-system-tests/utest/com/verigreen/collector/systemtest/TestCollectorE2EGreenPath.java b/verigreen-collector-system-tests/utest/com/verigreen/collector/systemtest/TestCollectorE2EGreenPath.java index aa4168c..0a66d4e 100644 --- a/verigreen-collector-system-tests/utest/com/verigreen/collector/systemtest/TestCollectorE2EGreenPath.java +++ b/verigreen-collector-system-tests/utest/com/verigreen/collector/systemtest/TestCollectorE2EGreenPath.java @@ -782,7 +782,7 @@ public void changeConfigFileRepositoryPath(String repo) throws IOException BufferedReader reader = new BufferedReader(new InputStreamReader(input)); StringBuilder out = new StringBuilder(); - String line, row = null; + String line, row; while ((line = reader.readLine()) != null) { row = line.toString(); if(line.toString().contains("git.repositoryLocation")){ @@ -810,7 +810,7 @@ public void changeConfigFileJobName(String job) throws IOException BufferedReader reader = new BufferedReader(new InputStreamReader(input)); StringBuilder out = new StringBuilder(); - String line, row = null; + String line, row; while ((line = reader.readLine()) != null) { row = line.toString(); if(line.toString().contains("jenkins.jobName")){ @@ -1225,7 +1225,7 @@ public void testCommiterNameChangesInRT() throws IOException, InterruptedExcepti BufferedReader reader = new BufferedReader(new InputStreamReader(input)); StringBuilder out = new StringBuilder(); StringBuilder outOriginal = new StringBuilder(); - String line, row = null; + String line, row; while ((line = reader.readLine()) != null) { row = line.toString(); outOriginal.append(row + "\n"); @@ -1284,7 +1284,7 @@ public void testProtectedBranchesChangesInRT() throws IOException, InterruptedEx BufferedReader reader = new BufferedReader(new InputStreamReader(input)); StringBuilder out = new StringBuilder(); StringBuilder outOriginal = new StringBuilder(); - String line, row = null; + String line, row; while ((line = reader.readLine()) != null) { row = line.toString(); outOriginal.append(row + "\n"); diff --git a/vg-common/src/com/verigreen/common/command/params/JsonCommandParametersConverter.java b/vg-common/src/com/verigreen/common/command/params/JsonCommandParametersConverter.java index 346e508..cfd75a1 100644 --- a/vg-common/src/com/verigreen/common/command/params/JsonCommandParametersConverter.java +++ b/vg-common/src/com/verigreen/common/command/params/JsonCommandParametersConverter.java @@ -39,7 +39,7 @@ public TEQCommandParameters deserialize(String params) { private Class getParamsClass(String[] split) { - Class paramsClass = null; + Class paramsClass; try { paramsClass = RuntimeUtils.cast(Class.forName(split[0])); } catch (ClassNotFoundException e) { diff --git a/vg-common/src/com/verigreen/common/concurrency/ResourceFinder.java b/vg-common/src/com/verigreen/common/concurrency/ResourceFinder.java index d63c23d..bded561 100644 --- a/vg-common/src/com/verigreen/common/concurrency/ResourceFinder.java +++ b/vg-common/src/com/verigreen/common/concurrency/ResourceFinder.java @@ -906,7 +906,7 @@ private static void readDirectoryEntries(URL location, Map resource private static void readJarEntries(URL location, String basePath, Map resources) throws IOException { JarURLConnection conn = (JarURLConnection) location.openConnection(); - JarFile jarfile = null; + JarFile jarfile; jarfile = conn.getJarFile(); Enumeration entries = jarfile.entries(); diff --git a/vg-common/src/com/verigreen/common/utils/ReflectionComparer.java b/vg-common/src/com/verigreen/common/utils/ReflectionComparer.java index e480497..d359503 100644 --- a/vg-common/src/com/verigreen/common/utils/ReflectionComparer.java +++ b/vg-common/src/com/verigreen/common/utils/ReflectionComparer.java @@ -44,7 +44,7 @@ public static boolean isEquals(T x, T y) { private static boolean isObjEquals(Object x, Object y) { - boolean ret = false; + boolean ret; if (x == null) { if (y == null) { ret = true; diff --git a/vg-rest-client/src/com/verigreen/restclient/RestClientImpl.java b/vg-rest-client/src/com/verigreen/restclient/RestClientImpl.java index 7075f82..4f40a7c 100644 --- a/vg-rest-client/src/com/verigreen/restclient/RestClientImpl.java +++ b/vg-rest-client/src/com/verigreen/restclient/RestClientImpl.java @@ -81,7 +81,7 @@ public void setAuthentcation(String userName, String password) { private void checkResponse(javax.ws.rs.core.Response response) throws RestClientException { if (response.getStatusInfo().getFamily() != Family.SUCCESSFUL) { - String responseStr = ""; + String responseStr; try (Scanner scanner = new Scanner((InputStream) response.getEntity(), CharEncoding.UTF_8)) { responseStr = scanner.useDelimiter("\\A").next();