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

Revert "changed datamodel, integrated poll configuration into tenant meta data table"

Browse Source 
This reverts commit 9d147aada710cc2333723604fa8893e4f2f0515f.

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
This commit is contained in:
Fabian Nonnenmacher
2016-01-27 17:24:43 +01:00
committed by Nonnenmacher Fabian
parent 6cef6aed1a
commit 49486755b2
4 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-core/src/main/java/org/eclipse/hawkbit/ControllerPollProperties.java
View File

@@ -13,6 +13,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* Defines the polling time for the controllers in HH:MM:SS notation.
*
*
*
*/
@ConfigurationProperties(prefix = "hawkbit.controller")
@@ -54,4 +56,5 @@ public class ControllerPollProperties {
public void setMinPollingTime(String minPollingTime) {
this.minPollingTime = minPollingTime;
}
}

27
hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java
View File

@@ -9,7 +9,6 @@
package org.eclipse.hawkbit.repository.model;
import java.io.Serializable;
import java.time.Duration;
import javax.persistence.Access;
import javax.persistence.AccessType;
@@ -25,11 +24,9 @@ import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import org.eclipse.hawkbit.repository.model.helper.DurationHelper;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
@@ -63,12 +60,6 @@ public class TenantMetaData implements Serializable {
@Column(name = "tenant", nullable = false, length = 40)
private String tenant;
@Column(name = "polling_time", nullable = true, length = 10)
private String pollingTime;
@Column(name = "polling_overdue_time", nullable = true, length = 10)
private String pollingOverdueTime;
private String createdBy;
private String lastModifiedBy;
private Long createdAt;
@@ -86,9 +77,6 @@ public class TenantMetaData implements Serializable {
// "fk_tenant_md_default_ds_type" )
private DistributionSetType defaultDsType;
@Transient
private DurationHelper dh = new DurationHelper();
public TenantMetaData() {
}
@@ -268,19 +256,4 @@ public class TenantMetaData implements Serializable {
return true;
}
public Duration getPollingTime() {
return dh.formattedStringToDuration(pollingTime);
}
public void setPollingTime(Duration pollingTime) {
this.pollingTime = dh.durationToFormattedString(pollingTime);
}
public Duration getPollingOverdueTime() {
return dh.formattedStringToDuration(pollingOverdueTime);
}
public void setPollingOverdueTime(Duration pollingOverdueTime) {
this.pollingOverdueTime = dh.durationToFormattedString(pollingOverdueTime);
}
}

2
hawkbit-repository/src/main/resources/db/migration/H2/V1_6_0__update_target_meta_for_polling___H2.sql
View File

@@ -1,2 +0,0 @@
ALTER TABLE sp_tenant ADD polling_time varchar(10);
ALTER TABLE sp_tenant ADD polling_overdue_time varchar(10);

3
hawkbit-repository/src/main/resources/db/migration/MYSQL/V1_6_0__update_target_meta_for_polling___MYSQL2.sql
View File

@@ -1,3 +0,0 @@
ALTER TABLE sp_tenant ADD polling_time varchar(10);
ALTER TABLE sp_tenant ADD polling_overdue_time varchar(10);