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/03/12 15:39:16 UTC
[ignite-teamcity-bot] branch ignite-11461-2 updated: IGNITE-11491:
Revisions were added to JAXB model & Compacted DB model for TC Bot:
Additional fields storage implemented
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-11461-2
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-11461-2 by this push:
new fd95fa5 IGNITE-11491: Revisions were added to JAXB model & Compacted DB model for TC Bot: Additional fields storage implemented
fd95fa5 is described below
commit fd95fa580c540bbd0ca18546722a4a2b72212023
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Mar 12 18:39:02 2019 +0300
IGNITE-11491: Revisions were added to JAXB model & Compacted DB model for TC Bot: Additional fields storage implemented
---
.../org/apache/ignite/ci/tcmodel/vcs/Revision.java | 23 ++++++++++++++-
.../ignite/ci/tcmodel/vcs/VcsRootInstance.java | 20 +++++++++++++
.../teamcity/ignited/change/RevisionCompacted.java | 33 +++++++++-------------
.../ignited/fatbuild/FatBuildCompacted.java | 18 +++++++++---
.../ignited/IgnitedTcInMemoryIntegrationTest.java | 7 +++++
5 files changed, 77 insertions(+), 24 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/Revision.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/Revision.java
index 2200b48..ae2ffd7 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/Revision.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/Revision.java
@@ -56,7 +56,28 @@ public class Revision {
/**
* @param ver Version.
*/
- public void version(String ver) {
+ public Revision version(String ver) {
this.version = ver;
+
+ return this;
+ }
+
+ /**
+ *
+ */
+ public VcsRootInstance vcsRootInstance() {
+ return vcsRootInstance;
+ }
+
+ public Revision vcsBranchName(String vcsBranchName) {
+ this.vcsBranchName = vcsBranchName;
+
+ return this;
+ }
+
+ public Revision vcsRootInstance(VcsRootInstance vcsRootInstance) {
+ this.vcsRootInstance = vcsRootInstance;
+
+ return this;
}
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/VcsRootInstance.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/VcsRootInstance.java
index 188b6b1..c3aa4b3 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/VcsRootInstance.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/vcs/VcsRootInstance.java
@@ -31,4 +31,24 @@ public class VcsRootInstance {
@XmlAttribute(name = "vcs-root-id")
private String vcsRootId;
+
+ public Integer id() {
+ return id;
+ }
+
+ public String vcsRootId() {
+ return vcsRootId;
+ }
+
+ public VcsRootInstance id(Integer id) {
+ this.id = id;
+
+ return this;
+ }
+
+ public VcsRootInstance vcsRootId(String vcsRootId) {
+ this.vcsRootId = vcsRootId;
+
+ return this;
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/change/RevisionCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/change/RevisionCompacted.java
index bd7f1b9..c7de5fc 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/change/RevisionCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/change/RevisionCompacted.java
@@ -24,6 +24,7 @@ import javax.xml.bind.DatatypeConverter;
import org.apache.ignite.ci.analysis.IVersionedEntity;
import org.apache.ignite.ci.db.Persisted;
import org.apache.ignite.ci.tcmodel.vcs.Revision;
+import org.apache.ignite.ci.tcmodel.vcs.VcsRootInstance;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildDao;
import org.slf4j.Logger;
@@ -56,28 +57,18 @@ public class RevisionCompacted implements IVersionedEntity {
/** Vcs root instance id. */
private int vcsRootInstanceId = -1;
+ /**
+ * @param compactor Compactor.
+ * @param revision Revision.
+ */
public RevisionCompacted(IStringCompactor compactor, Revision revision) {
-/*
- try {
- id = Integer.parseInt(version);
+ VcsRootInstance vcsRootInstance = revision.vcsRootInstance();
+ if (vcsRootInstance != null) {
+ vcsRootId = compactor.getStringId(vcsRootInstance.vcsRootId());
+ vcsRootInstanceId = vcsRootInstance.id() != null ? vcsRootInstance.id() : -1;
}
- catch (NumberFormatException e) {
- logger.error("Change ID parse failed " + change.id + ":" + e.getMessage(), e);
- }
- vcsRootId = compactor.getStringId(revision.vcs());
+ vcsBranchName = compactor.getStringId(revision.vcsBranchName());
- if (change.user != null) {
- try {
- tcUserId = Integer.parseInt(change.user.id);
- }
- catch (NumberFormatException e) {
- logger.error("TC User id parse failed " + change.user.id + ":" + e.getMessage(), e);
- }
- tcUserUsername = compactor.getStringId(change.user.username);
- tcUserFullname = compactor.getStringId(change.user.name);
- }
-*/
-//todo
String ver = revision.version();
if (!Strings.isNullOrEmpty(ver)) {
@@ -111,6 +102,10 @@ public class RevisionCompacted implements IVersionedEntity {
return compactor.getStringFromId(vcsRootId);
}
+ public Integer vcsRootInstanceId() {
+ return vcsRootInstanceId < 0 ? null : vcsRootInstanceId;
+ }
+
/**
*
*/
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
index 029c008..d413643 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/FatBuildCompacted.java
@@ -41,6 +41,7 @@ import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrencesFull;
import org.apache.ignite.ci.tcmodel.user.User;
import org.apache.ignite.ci.tcmodel.vcs.Revision;
import org.apache.ignite.ci.tcmodel.vcs.Revisions;
+import org.apache.ignite.ci.tcmodel.vcs.VcsRootInstance;
import org.apache.ignite.ci.teamcity.ignited.BuildRefCompacted;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.change.RevisionCompacted;
@@ -305,12 +306,21 @@ public class FatBuildCompacted extends BuildRefCompacted implements IVersionedEn
if (revisions != null) {
List<RevisionCompacted> revs = Arrays.asList(revisions);
- res.setRevisions(revs.stream().map(rev->{
- Revision revision = new Revision();
+ res.setRevisions(revs.stream().map(revComp -> {
+ Revision revision = new Revision()
+ .version(revComp.commitFullVersion())
+ .vcsBranchName(revComp.vcsBranchName(compactor));
- revision.version(rev.commitFullVersion());
+ String vcsRootId = revComp.vcsRootId(compactor);
+ Integer vcsRootInstanceId = revComp.vcsRootInstanceId();
- return revision;
+ if (vcsRootId == null && vcsRootInstanceId == null)
+ return revision;
+
+ return revision.vcsRootInstance(
+ new VcsRootInstance()
+ .id(vcsRootInstanceId)
+ .vcsRootId(vcsRootId));
}).collect(Collectors.toList()));
}
}
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
index bfababe..04964fd 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/teamcity/ignited/IgnitedTcInMemoryIntegrationTest.java
@@ -525,6 +525,13 @@ public class IgnitedTcInMemoryIntegrationTest {
Set<String> actVersions = actRevisions.revisions().stream().map(Revision::version).collect(Collectors.toSet());
assertEquals(refVersions, actVersions);
+
+ Revision refRev0 = refRevisions.revisions().get(0);
+ Revision actRev0 = actRevisions.revisions().get(0);
+
+ assertEquals(refRev0.vcsBranchName(), actRev0.vcsBranchName());
+ assertEquals(refRev0.vcsRootInstance().id(), actRev0.vcsRootInstance().id());
+ assertEquals(refRev0.vcsRootInstance().vcsRootId(), actRev0.vcsRootInstance().vcsRootId());
}
private void saveTmpFile(Object obj, String name) throws IOException, JAXBException {