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/01/14 15:50:55 UTC
[ignite-teamcity-bot] branch ignite-10930 updated: IGNITE-10930: PR
less contributions: new classes for separation of Pure and cached JIRA
interactions
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10930
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10930 by this push:
new caa18b8 IGNITE-10930: PR less contributions: new classes for separation of Pure and cached JIRA interactions
caa18b8 is described below
commit caa18b814cf371f5fce522dd65bfceab07902c4b
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Jan 14 18:50:52 2019 +0300
IGNITE-10930: PR less contributions: new classes for separation of Pure and cached JIRA interactions
---
.../org/apache/ignite/ci/di/IgniteTcBotModule.java | 2 +-
.../IJiraIgnited.java} | 15 ++-----------
.../IJiraIgnitedProvider.java} | 19 ++++++----------
.../JiraIgnited.java} | 17 ++++++---------
.../JiraIgnitedModule.java} | 12 ++++-------
.../JiraIgnitedProvider.java} | 25 +++++++++++-----------
.../org/apache/ignite/ci/jira/{ => pure}/Jira.java | 6 +++---
.../ci/jira/{ => pure}/JiraIntegrationModule.java | 6 ++----
.../jira/{ => pure}/JiraIntegrationProvider.java | 4 ++--
9 files changed, 40 insertions(+), 66 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java
index bbb68ec..e58d398 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java
@@ -28,7 +28,7 @@ import org.apache.ignite.ci.db.Ignite1Init;
import org.apache.ignite.ci.di.cache.GuavaCachedModule;
import org.apache.ignite.ci.di.scheduler.SchedulerModule;
import org.apache.ignite.ci.github.ignited.GitHubIgnitedModule;
-import org.apache.ignite.ci.jira.JiraIntegrationModule;
+import org.apache.ignite.ci.jira.pure.JiraIntegrationModule;
import org.apache.ignite.ci.observer.BuildObserver;
import org.apache.ignite.ci.observer.ObserverTask;
import org.apache.ignite.ci.tcbot.TcBotBusinessServicesModule;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java
similarity index 60%
copy from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
copy to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java
index 48a0689..50933aa 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnited.java
@@ -14,21 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.ignite.ci.jira;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.internal.SingletonScope;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
-import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
+package org.apache.ignite.ci.jira.ignited;
/**
*
*/
-public class JiraIntegrationModule extends AbstractModule {
- /** {@inheritDoc} */
- @Override protected void configure() {
- bind(IJiraIntegration.class).to(Jira.class);
- bind(IJiraIntegrationProvider.class).to(JiraIntegrationProvider.class).in(new SingletonScope());
- }
+public interface IJiraIgnited {
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnitedProvider.java
similarity index 60%
copy from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
copy to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnitedProvider.java
index 48a0689..8ca0db5 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/IJiraIgnitedProvider.java
@@ -14,21 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.ignite.ci.jira;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.internal.SingletonScope;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
-import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
+package org.apache.ignite.ci.jira.ignited;
/**
*
*/
-public class JiraIntegrationModule extends AbstractModule {
- /** {@inheritDoc} */
- @Override protected void configure() {
- bind(IJiraIntegration.class).to(Jira.class);
- bind(IJiraIntegrationProvider.class).to(JiraIntegrationProvider.class).in(new SingletonScope());
- }
+public interface IJiraIgnitedProvider {
+ /**
+ * @param srvId Server id.
+ */
+ public IJiraIgnited server(String srvId);
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
similarity index 64%
copy from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
copy to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
index 48a0689..47f4e43 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnited.java
@@ -14,21 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.ignite.ci.jira.ignited;
-package org.apache.ignite.ci.jira;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.internal.SingletonScope;
import org.apache.ignite.ci.jira.pure.IJiraIntegration;
-import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
/**
*
*/
-public class JiraIntegrationModule extends AbstractModule {
- /** {@inheritDoc} */
- @Override protected void configure() {
- bind(IJiraIntegration.class).to(Jira.class);
- bind(IJiraIntegrationProvider.class).to(JiraIntegrationProvider.class).in(new SingletonScope());
+class JiraIgnited implements IJiraIgnited {
+ /** Pure HTTP Jira connection. */
+ private IJiraIntegration jira;
+
+ public void init(IJiraIntegration jira) {
+ this.jira = jira;
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnitedModule.java
similarity index 68%
copy from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
copy to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnitedModule.java
index 48a0689..ea354aa 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnitedModule.java
@@ -14,21 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.ignite.ci.jira;
+package org.apache.ignite.ci.jira.ignited;
import com.google.inject.AbstractModule;
-import com.google.inject.internal.SingletonScope;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
-import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
+import org.apache.ignite.ci.jira.pure.JiraIntegrationModule;
/**
*
*/
-public class JiraIntegrationModule extends AbstractModule {
+public class JiraIgnitedModule extends AbstractModule {
/** {@inheritDoc} */
@Override protected void configure() {
- bind(IJiraIntegration.class).to(Jira.class);
- bind(IJiraIntegrationProvider.class).to(JiraIntegrationProvider.class).in(new SingletonScope());
+ install(new JiraIntegrationModule());
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationProvider.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnitedProvider.java
similarity index 73%
copy from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationProvider.java
copy to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnitedProvider.java
index 0c50d93..451c75f 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationProvider.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/ignited/JiraIgnitedProvider.java
@@ -14,8 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.ignite.ci.jira;
+package org.apache.ignite.ci.jira.ignited;
import com.google.common.base.Strings;
import com.google.common.cache.Cache;
@@ -29,16 +28,17 @@ 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.
+ *
*/
-public class JiraIntegrationProvider implements IJiraIntegrationProvider {
+public class JiraIgnitedProvider implements IJiraIgnitedProvider {
+ /** */
+ @Inject IJiraIntegrationProvider pureProv;
+
/** */
- @Inject Provider<IJiraIntegration> factory;
+ @Inject Provider<JiraIgnited> factory;
/** */
- private final Cache<String, IJiraIntegration> srvs
+ private final Cache<String, IJiraIgnited> srvs
= CacheBuilder.newBuilder()
.maximumSize(100)
.expireAfterAccess(16, TimeUnit.MINUTES)
@@ -46,14 +46,15 @@ public class JiraIntegrationProvider implements IJiraIntegrationProvider {
.build();
/** */
- @Override public IJiraIntegration server(String srvId) {
+ @Override public IJiraIgnited server(String srvId) {
try {
return srvs.get(Strings.nullToEmpty(srvId), () -> {
- IJiraIntegration jiraIntegration = factory.get();
+ IJiraIntegration pure = pureProv.server(srvId);
- jiraIntegration.init(srvId);
+ JiraIgnited ignited = factory.get();
+ ignited.init(pure);
- return jiraIntegration;
+ return ignited;
});
}
catch (ExecutionException e) {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Jira.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Jira.java
similarity index 95%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Jira.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Jira.java
index 879cbe1..7a163cc 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/Jira.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/Jira.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.jira;
+package org.apache.ignite.ci.jira.pure;
import com.google.common.base.Preconditions;
import java.io.File;
@@ -23,7 +23,7 @@ import java.util.Properties;
import javax.inject.Inject;
import org.apache.ignite.ci.HelperConfig;
import org.apache.ignite.ci.ITcHelper;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
+import org.apache.ignite.ci.jira.Tickets;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.web.model.Visa;
import org.jetbrains.annotations.NotNull;
@@ -33,7 +33,7 @@ import static com.google.common.base.Strings.isNullOrEmpty;
/**
*
*/
-public class Jira implements IJiraIntegration {
+class Jira implements IJiraIntegration {
/** */
@Inject ITcHelper helper;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationModule.java
similarity index 88%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationModule.java
index 48a0689..3c19a9f 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationModule.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationModule.java
@@ -15,15 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.jira;
+package org.apache.ignite.ci.jira.pure;
import com.google.inject.AbstractModule;
import com.google.inject.internal.SingletonScope;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
-import org.apache.ignite.ci.jira.pure.IJiraIntegrationProvider;
/**
- *
+ * JIRA pure integration module
*/
public class JiraIntegrationModule extends AbstractModule {
/** {@inheritDoc} */
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationProvider.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java
similarity index 95%
rename from ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationProvider.java
rename to ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java
index 0c50d93..c2c8cdc 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/JiraIntegrationProvider.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/jira/pure/JiraIntegrationProvider.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.ci.jira;
+package org.apache.ignite.ci.jira.pure;
import com.google.common.base.Strings;
import com.google.common.cache.Cache;
@@ -33,7 +33,7 @@ import org.apache.ignite.ci.util.ExceptionUtil;
* server. Instance for each server is cached with defining instance
* expiration time.
*/
-public class JiraIntegrationProvider implements IJiraIntegrationProvider {
+class JiraIntegrationProvider implements IJiraIntegrationProvider {
/** */
@Inject Provider<IJiraIntegration> factory;