You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/02/14 16:28:46 UTC
[ignite-teamcity-bot] branch master updated: Optimize imports &
code formatted for JIRA integration
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new c8b24fe Optimize imports & code formatted for JIRA integration
c8b24fe is described below
commit c8b24feab2951017e1ec2407906679456a753460
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Feb 14 19:28:42 2019 +0300
Optimize imports & code formatted for JIRA integration
---
.../src/main/java/org/apache/ignite/ci/jira/Tickets.java | 3 +--
.../java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java | 1 -
.../main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java | 3 +--
.../java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java | 9 +++++----
.../java/org/apache/ignite/ci/jira/ignited/JiraTicketSync.java | 2 +-
.../java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java | 4 ++--
.../src/main/java/org/apache/ignite/ci/jira/package-info.java | 5 ++---
.../src/main/java/org/apache/ignite/ci/jira/pure/Jira.java | 1 -
.../org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java | 7 ++-----
.../src/main/java/org/apache/ignite/ci/jira/pure/Ticket.java | 3 +--
10 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Tickets.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Tickets.java
index a6e3758..4ce85c5 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Tickets.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Tickets.java
@@ -22,8 +22,7 @@ import java.util.Collections;
import org.apache.ignite.ci.jira.pure.Ticket;
/**
- * See example of GSON here
- * https://issues.apache.org/jira/rest/api/2/search?jql=project%20=%20IGNITE%20order%20by%20updated%20DESC&fields=status
+ * See example of GSON here https://issues.apache.org/jira/rest/api/2/search?jql=project%20=%20IGNITE%20order%20by%20updated%20DESC&fields=status
*/
@SuppressWarnings("PublicField")
public class Tickets {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java
index 6288d43..0934ab4 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java
@@ -42,7 +42,6 @@ public interface IJiraIgnited {
*/
public String generateTicketUrl(String id);
-
/**
* @param ticket JIRA ticket full name. E.g 'IGNITE-5555'.
* @param comment Comment to be placed in the ticket conversation.
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
index d02c385..790a76d 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
@@ -19,8 +19,8 @@ package org.apache.ignite.ci.jira.ignited;
import java.io.IOException;
import java.util.Set;
import javax.inject.Inject;
-import org.apache.ignite.ci.jira.pure.Ticket;
import org.apache.ignite.ci.jira.pure.IJiraIntegration;
+import org.apache.ignite.ci.jira.pure.Ticket;
import org.apache.ignite.ci.tcbot.conf.IJiraServerConfig;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
@@ -56,7 +56,6 @@ class JiraIgnited implements IJiraIgnited {
jiraTicketDao.init();
}
-
/** {@inheritDoc} */
@Override public Set<Ticket> getTickets() {
jiraTicketSync.ensureActualizeJiraTickets(srvCode);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java
index 2250e38..231efd8 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketDao.java
@@ -19,9 +19,9 @@ package org.apache.ignite.ci.jira.ignited;
import com.google.common.base.Preconditions;
import java.util.Collection;
-import java.util.Map;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import javax.cache.Cache;
import javax.inject.Inject;
@@ -67,7 +67,7 @@ public class JiraTicketDao {
@GuavaCached(expireAfterWriteSecs = 60, softValues = true)
public Set<Ticket> getTickets(int srvIdMaskHigh, String projectCode) {
Preconditions.checkNotNull(jiraCache, "init() was not called");
- long srvId = (long) srvIdMaskHigh << 32;
+ long srvId = (long)srvIdMaskHigh << 32;
Set<Ticket> res = new HashSet<>();
@@ -87,11 +87,12 @@ public class JiraTicketDao {
* @return Key from server-project pair.
*/
public static long ticketToCacheKey(int srvIdMaskHigh, int igniteId) {
- return (long) igniteId | (long) srvIdMaskHigh << 32;
+ return (long)igniteId | (long)srvIdMaskHigh << 32;
}
/**
* Save small part of loaded mutes.
+ *
* @param srvIdMaskHigh Server id mask high.
* @param chunk Chunk.
* @param projectCode Project code for contributions listing and for comments.
@@ -124,7 +125,7 @@ public class JiraTicketDao {
ticketsToUpdate.put(k, v);
});
- if(!ticketsToUpdate.isEmpty())
+ if (!ticketsToUpdate.isEmpty())
jiraCache.putAll(ticketsToUpdate);
return ticketsToUpdate.size();
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketSync.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketSync.java
index b269176..2ba7bab 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketSync.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraTicketSync.java
@@ -87,6 +87,7 @@ public class JiraTicketSync {
private String taskName(String taskName, String srvId) {
return JiraTicketSync.class.getSimpleName() + "." + taskName + "." + srvId;
}
+
/**
* @param srvId Server internal identification.
* @param fullResync full or incremental.
@@ -107,7 +108,6 @@ public class JiraTicketSync {
"fields=" + reqFields +
"&maxResults=100";
-
String url = baseUrl;
logger.info("Requesting JIRA tickets using URL " + url + ("\n" + cfg.restApiUrl() + url));
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
index f009a8f..0cece92 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/TicketCompacted.java
@@ -42,10 +42,10 @@ public class TicketCompacted {
/** Summary, nullable because of older entries. */
@Nullable private StringFieldCompacted summary = new StringFieldCompacted();
- /** Custom field, to be queriable after persisting in Ignite, nullable because of older entry versions. */
+ /** Custom field, to be queriable after persisting in Ignite, nullable because of older entry versions. */
@Nullable private StringFieldCompacted customfield_11050 = new StringFieldCompacted();
- /** Full description, nullable because of older entry versions. */
+ /** Full description, nullable because of older entry versions. */
@Nullable private StringFieldCompacted description = new StringFieldCompacted();
/**
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/package-info.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/package-info.java
index 7c06326..4a7ae03 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/package-info.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/package-info.java
@@ -16,8 +16,7 @@
*/
/**
- * This package is inteneded for interacting with Jira servers. It contains
- * classes which is needed for injection Jira integration service instance
- * via Guice. And interfaces and classes which provide specified functionality.
+ * This package is inteneded for interacting with Jira servers. It contains classes which is needed for injection Jira
+ * integration service instance via Guice. And interfaces and classes which provide specified functionality.
*/
package org.apache.ignite.ci.jira;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Jira.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Jira.java
index fab758a..87a7d57 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Jira.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Jira.java
@@ -27,7 +27,6 @@ import org.apache.ignite.ci.tcbot.conf.IJiraServerConfig;
import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.util.HttpUtil;
import org.checkerframework.checker.nullness.qual.Nullable;
-import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java
index c2c8cdc..e3b4100 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java
@@ -24,14 +24,11 @@ import com.google.inject.Provider;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
-import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
import org.apache.ignite.ci.util.ExceptionUtil;
/**
- * Class for providing {@link IJiraIntegration} instance for specified Jira
- * server. Instance for each server is cached with defining instance
- * expiration time.
+ * Class for providing {@link IJiraIntegration} instance for specified Jira server. Instance for each server is cached
+ * with defining instance expiration time.
*/
class JiraIntegrationProvider implements IJiraIntegrationProvider {
/** */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Ticket.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Ticket.java
index 4d5c514..48ca735 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Ticket.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Ticket.java
@@ -21,8 +21,7 @@ import com.google.common.base.MoreObjects;
import org.apache.ignite.ci.jira.ignited.TicketCompacted;
/**
- * See example of GSON here
- * https://issues.apache.org/jira/rest/api/2/issue/IGNITE-123
+ * See example of GSON here https://issues.apache.org/jira/rest/api/2/issue/IGNITE-123
*/
public class Ticket {
/** Id. */