lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Artefact last modified is returned my DMF auth call (#600)

Browse Source 
* Last modified is stored as part of artifact and returns accordingly by
APIs.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fixed tests.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Check value > 0

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Use created at.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Sonar issue fixed.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2018-02-06 08:32:36 +01:00
committed by GitHub
parent 61c862d296
commit 96a8ad0461
15 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java
View File

@@ -44,8 +44,8 @@ public abstract class AbstractJpaBaseEntity implements BaseEntity {
private String createdBy;
private String lastModifiedBy;
private Long createdAt;
private Long lastModifiedAt;
private long createdAt;
private long lastModifiedAt;
@Version
@Column(name = "optlock_revision")
@@ -61,7 +61,7 @@ public abstract class AbstractJpaBaseEntity implements BaseEntity {
@Override
@Access(AccessType.PROPERTY)
@Column(name = "created_at", insertable = true, updatable = false)
public Long getCreatedAt() {
public long getCreatedAt() {
return createdAt;
}
@@ -75,7 +75,7 @@ public abstract class AbstractJpaBaseEntity implements BaseEntity {
@Override
@Access(AccessType.PROPERTY)
@Column(name = "last_modified_at", insertable = true, updatable = true)
public Long getLastModifiedAt() {
public long getLastModifiedAt() {
return lastModifiedAt;
}
@@ -97,12 +97,12 @@ public abstract class AbstractJpaBaseEntity implements BaseEntity {
}
@CreatedDate
public void setCreatedAt(final Long createdAt) {
public void setCreatedAt(final long createdAt) {
this.createdAt = createdAt;
}
@LastModifiedDate
public void setLastModifiedAt(final Long lastModifiedAt) {
public void setLastModifiedAt(final long lastModifiedAt) {
if (isController()) {
return;

2
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java
View File

@@ -458,7 +458,7 @@ public class DeploymentManagementTest extends AbstractJpaIntegrationTest {
.as("TargetUpdateStatus IN_SYNC")
.allMatch(target -> TargetUpdateStatus.IN_SYNC.equals(target.getUpdateStatus()))
.as("InstallationDate equal to LastModifiedAt")
.allMatch(target -> target.getLastModifiedAt().equals(target.getInstallationDate()));
.allMatch(target -> target.getLastModifiedAt() == target.getInstallationDate());
}
@Test