diff --git a/transformers/emobility-echarging/pom.xml b/transformers/emobility-echarging/pom.xml index 5ad1060..6541a52 100644 --- a/transformers/emobility-echarging/pom.xml +++ b/transformers/emobility-echarging/pom.xml @@ -70,9 +70,9 @@ SPDX-License-Identifier: CC0-1.0 - it.bz.idm.bdp - dc-interface - 8.0.0 + com.opendatahub.timeseries.bdp + client + 1.0.0 diff --git a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/ChargePusher.java b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/ChargePusher.java index e6b905f..5097643 100644 --- a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/ChargePusher.java +++ b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/ChargePusher.java @@ -14,14 +14,14 @@ import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; -import it.bz.idm.bdp.dto.DataMapDto; -import it.bz.idm.bdp.dto.DataTypeDto; -import it.bz.idm.bdp.dto.ProvenanceDto; -import it.bz.idm.bdp.dto.RecordDtoImpl; -import it.bz.idm.bdp.dto.SimpleRecordDto; -import it.bz.idm.bdp.dto.StationDto; -import it.bz.idm.bdp.dto.StationList; -import it.bz.idm.bdp.json.NonBlockingJSONPusher; +import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto; +import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto; +import com.opendatahub.timeseries.bdp.dto.dto.ProvenanceDto; +import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl; +import com.opendatahub.timeseries.bdp.dto.dto.SimpleRecordDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationList; +import com.opendatahub.timeseries.bdp.client.json.NonBlockingJSONPusher; import com.opendatahub.dc.echarging.dto.ChargerDtoV2; import com.opendatahub.dc.echarging.dto.ChargingPointsDtoV2; @@ -37,7 +37,7 @@ public class ChargePusher extends NonBlockingJSONPusher { private Environment env; @Override - public String initIntegreenTypology() { + public String initStationType() { return "EChargingStation"; } @@ -83,7 +83,7 @@ public StationList mapStations2bdp(List fetchedStations) { s.getMetaData().put("accessType", dto.getAccessType()); s.getMetaData().put("categories", dto.getCategories()); s.setOrigin(origin); - s.setStationType(this.integreenTypology); + s.setStationType(this.stationType); if (s.isValid()) { stations.add(s); } else { diff --git a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Main.java b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Main.java index 2bcfcc4..73798f6 100644 --- a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Main.java +++ b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Main.java @@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling -@ComponentScan({"com.opendatahub.dc.echarging", "it.bz.idm.bdp"}) +@ComponentScan({"com.opendatahub.dc.echarging", "com.opendatahub.timeseries.bdp"}) @SpringBootApplication public class Main { public static void main(String[] args) { diff --git a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Transformer.java b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Transformer.java index a161df8..edadbbe 100644 --- a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Transformer.java +++ b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/Transformer.java @@ -18,10 +18,10 @@ import com.opendatahub.transformer.lib.listener.MsgDto; import com.opendatahub.transformer.lib.listener.TransformerListener; -import it.bz.idm.bdp.dto.DataMapDto; -import it.bz.idm.bdp.dto.DataTypeDto; -import it.bz.idm.bdp.dto.RecordDtoImpl; -import it.bz.idm.bdp.dto.StationList; +import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto; +import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto; +import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl; +import com.opendatahub.timeseries.bdp.dto.dto.StationList; @Service public class Transformer { diff --git a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/dto/ChildPlugDto.java b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/dto/ChildPlugDto.java index 9c179b0..b4284c3 100644 --- a/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/dto/ChildPlugDto.java +++ b/transformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/dto/ChildPlugDto.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; -import it.bz.idm.bdp.dto.ChildDto; +import com.opendatahub.timeseries.bdp.dto.dto.ChildDto; @JsonInclude(value=Include.NON_EMPTY) public class ChildPlugDto extends ChildDto{ diff --git a/transformers/emobility-echarging/src/test/java/com/opendatahub/dc/echarging/PusherTestIT.java b/transformers/emobility-echarging/src/test/java/com/opendatahub/dc/echarging/PusherTestIT.java index 7dbe93e..2f07eef 100644 --- a/transformers/emobility-echarging/src/test/java/com/opendatahub/dc/echarging/PusherTestIT.java +++ b/transformers/emobility-echarging/src/test/java/com/opendatahub/dc/echarging/PusherTestIT.java @@ -23,12 +23,12 @@ import com.opendatahub.dc.echarging.dto.ChargingPositionDto; import com.opendatahub.dc.echarging.dto.OutletDtoV2; -import it.bz.idm.bdp.dto.DataMapDto; -import it.bz.idm.bdp.dto.DataTypeDto; -import it.bz.idm.bdp.dto.RecordDtoImpl; -import it.bz.idm.bdp.dto.SimpleRecordDto; -import it.bz.idm.bdp.dto.StationDto; -import it.bz.idm.bdp.dto.StationList; +import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto; +import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto; +import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl; +import com.opendatahub.timeseries.bdp.dto.dto.SimpleRecordDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationList; public class PusherTestIT extends AbstractJUnit4SpringContextTests{ diff --git a/transformers/google-spreadsheet/pom.xml b/transformers/google-spreadsheet/pom.xml index d31c20e..99be7e9 100644 --- a/transformers/google-spreadsheet/pom.xml +++ b/transformers/google-spreadsheet/pom.xml @@ -46,9 +46,9 @@ 1.0 - it.bz.idm.bdp - dc-interface - 8.0.0 + com.opendatahub.timeseries.bdp + client + 1.0.0 com.google.api-client diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/GenericTransformer.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/GenericTransformer.java index f3bf809..ba3f40b 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/GenericTransformer.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/GenericTransformer.java @@ -24,11 +24,11 @@ import com.opendatahub.transformer.spreadsheet.google.services.ODHClient; import com.opendatahub.transformer.spreadsheet.google.util.SheetUtil; -import it.bz.idm.bdp.dto.DataMapDto; -import it.bz.idm.bdp.dto.DataTypeDto; -import it.bz.idm.bdp.dto.RecordDtoImpl; -import it.bz.idm.bdp.dto.SimpleRecordDto; -import it.bz.idm.bdp.dto.StationList; +import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto; +import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto; +import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl; +import com.opendatahub.timeseries.bdp.dto.dto.SimpleRecordDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationList; @Service /* This is the default implementation of a spreadsheet transformer. diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/Main.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/Main.java index 913b73f..640c98b 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/Main.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/Main.java @@ -13,7 +13,7 @@ import com.opendatahub.transformer.lib.listener.TransformerListener; import com.opendatahub.transformer.spreadsheet.google.util.Decoder; -@ComponentScan({"com.opendatahub.transformer.spreadsheet.google", "it.bz.idm.bdp"}) +@ComponentScan({"com.opendatahub.transformer.spreadsheet.google", "com.opendatahub.timeseries.bdp"}) @SpringBootApplication public class Main { private Logger logger = LoggerFactory.getLogger(Main.class); diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/StaEchargingTransformer.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/StaEchargingTransformer.java index 862695b..4c8a7c5 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/StaEchargingTransformer.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/StaEchargingTransformer.java @@ -27,8 +27,8 @@ import com.opendatahub.transformer.spreadsheet.google.services.ODHClient; import com.opendatahub.transformer.spreadsheet.google.util.SheetUtil; -import it.bz.idm.bdp.dto.StationDto; -import it.bz.idm.bdp.dto.StationList; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationList; /** * Reads static e-charging stations from a google spreadsheet and maps them to diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/DataTypeWrapperDto.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/DataTypeWrapperDto.java index d41ebba..7c0fa95 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/DataTypeWrapperDto.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/DataTypeWrapperDto.java @@ -4,7 +4,7 @@ package com.opendatahub.transformer.spreadsheet.google.dto; -import it.bz.idm.bdp.dto.DataTypeDto; +import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto; public class DataTypeWrapperDto { private DataTypeDto type; diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/MappingResult.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/MappingResult.java index adefc1d..92e086d 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/MappingResult.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/MappingResult.java @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; -import it.bz.idm.bdp.dto.StationDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; public class MappingResult { private List stationDtos = new ArrayList(); diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/mapper/DynamicMapper.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/mapper/DynamicMapper.java index 8606292..5fc4bc1 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/mapper/DynamicMapper.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/mapper/DynamicMapper.java @@ -25,9 +25,9 @@ import org.springframework.stereotype.Component; -import it.bz.idm.bdp.dto.DataTypeDto; -import it.bz.idm.bdp.dto.StationDto; -import it.bz.idm.bdp.dto.StationList; +import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationList; import jakarta.annotation.PostConstruct; import com.google.api.services.sheets.v4.model.Sheet; diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/services/ODHClient.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/services/ODHClient.java index 2654d7d..d082ffa 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/services/ODHClient.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/services/ODHClient.java @@ -7,10 +7,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import it.bz.idm.bdp.dto.DataMapDto; -import it.bz.idm.bdp.dto.ProvenanceDto; -import it.bz.idm.bdp.dto.RecordDtoImpl; -import it.bz.idm.bdp.json.NonBlockingJSONPusher; +import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto; +import com.opendatahub.timeseries.bdp.dto.dto.ProvenanceDto; +import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl; +import com.opendatahub.timeseries.bdp.client.json.NonBlockingJSONPusher; @Component public class ODHClient extends NonBlockingJSONPusher{ @@ -31,7 +31,7 @@ public DataMapDto mapData(T data) { } @Override - public String initIntegreenTypology() { + public String initStationType() { return stationtype; } diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/Lang.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/Lang.java index 1d6a145..6476cd8 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/Lang.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/Lang.java @@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import it.bz.idm.bdp.dto.StationDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; import jakarta.annotation.PostConstruct; @Component diff --git a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/LocationLookupUtil.java b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/LocationLookupUtil.java index a9a9896..90d089a 100644 --- a/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/LocationLookupUtil.java +++ b/transformers/google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/LocationLookupUtil.java @@ -7,10 +7,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import it.bz.idm.bdp.dto.StationDto; -import it.bz.idm.bdp.util.LocationLookup; -import it.bz.idm.bdp.util.NominatimException; -import it.bz.idm.bdp.util.NominatimLocationLookupUtil; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; +import com.opendatahub.timeseries.bdp.client.util.LocationLookup; +import com.opendatahub.timeseries.bdp.client.util.NominatimException; +import com.opendatahub.timeseries.bdp.client.util.NominatimLocationLookupUtil; @Component public class LocationLookupUtil { diff --git a/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/OdhClient.java b/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/OdhClient.java index 2a14501..bdea9a1 100644 --- a/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/OdhClient.java +++ b/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/OdhClient.java @@ -4,10 +4,10 @@ package com.opendatahub.tr.meteorology.eurac; -import it.bz.idm.bdp.dto.DataMapDto; -import it.bz.idm.bdp.dto.ProvenanceDto; -import it.bz.idm.bdp.dto.RecordDtoImpl; -import it.bz.idm.bdp.json.NonBlockingJSONPusher; +import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto; +import com.opendatahub.timeseries.bdp.dto.dto.ProvenanceDto; +import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl; +import com.opendatahub.timeseries.bdpjson.NonBlockingJSONPusher; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/Transformer.java b/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/Transformer.java index da9a394..9208aeb 100644 --- a/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/Transformer.java +++ b/transformers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/Transformer.java @@ -22,11 +22,11 @@ import com.opendatahub.transformer.lib.listener.MsgDto; import com.opendatahub.transformer.lib.listener.TransformerListener; -import it.bz.idm.bdp.dto.DataMapDto; -import it.bz.idm.bdp.dto.DataTypeDto; -import it.bz.idm.bdp.dto.RecordDtoImpl; -import it.bz.idm.bdp.dto.StationDto; -import it.bz.idm.bdp.dto.StationList; +import com.opendatahub.timeseries.bdp.dto.dto.DataMapDto; +import com.opendatahub.timeseries.bdp.dto.dto.DataTypeDto; +import com.opendatahub.timeseries.bdp.dto.dto.RecordDtoImpl; +import com.opendatahub.timeseries.bdp.dto.dto.StationDto; +import com.opendatahub.timeseries.bdp.dto.dto.StationList; @Service public class Transformer {