diff --git a/pom.xml b/pom.xml index aef23d3..70fe8b7 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ com.loafle.overflow commons-java - 1.0.118-SNAPSHOT + 1.0.120-SNAPSHOT diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorConfigService.java b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorConfigService.java index 662632a..93b0074 100644 --- a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorConfigService.java +++ b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorConfigService.java @@ -29,7 +29,6 @@ import com.loafle.overflow.model.sensor.SensorItem; import com.loafle.overflow.model.sensorconfig.SensorConfig; import com.loafle.overflow.model.sensorconfig.SensorConfigConnection; import com.loafle.overflow.model.sensorconfig.SensorConfigCrawler; -import com.loafle.overflow.model.sensorconfig.SensorConfigItems; import com.loafle.overflow.model.sensorconfig.SensorConfigSchedule; import com.loafle.overflow.service.central.meta.MetaCollectionItemMappingService; @@ -58,7 +57,7 @@ public class CentralSensorConfigService { sensorConfig.setCrawler(this.configCrawler(sensor)); sensorConfig.setConnection(this.configConnection(sensor)); sensorConfig.setSchedule(this.configSchedule(sensor)); - sensorConfig.setItems(this.configItems(sensor)); + sensorConfig.setMetaCollectionItems(this.configItems(sensor)); Probe probe = sensor.getTarget().getInfra().getProbe(); String encryptedSensorConfigBase64 = this.toEncryptString(sensorConfig, probe.getEncryptionKey()); @@ -184,7 +183,7 @@ public class CentralSensorConfigService { return sensorConfigSchedule; } - private SensorConfigItems configItems(Sensor sensor) throws OverflowException { + private List configItems(Sensor sensor) throws OverflowException { List sensorItems = this.sensorItemService.readAllBySensorID(sensor.getId()); if (null == sensorItems || sensorItems.size() == 0) { throw new OverflowException(String.format("ID[%s] of Sensor has no SensorItem", sensor.getId())); @@ -198,9 +197,6 @@ public class CentralSensorConfigService { } } - SensorConfigItems sensorConfigItems = new SensorConfigItems(); - sensorConfigItems.setMetaCollectionItems(metaCollectionItems); - - return sensorConfigItems; + return metaCollectionItems; } }