fix some transformer issues, and while we're at it migrate them to th…

…e newly renamed bdp-core libraries
noi-techpark · Dec 4, 2023 · 1dbba25 · 1dbba25
1 parent d9eeda5
commit 1dbba25
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 60 deletions.
diff --git a/transformers/emobility-echarging/pom.xml b/transformers/emobility-echarging/pom.xml
@@ -70,9 +70,9 @@ SPDX-License-Identifier: CC0-1.0
         </dependency>
 
         <dependency>
-            <groupId>it.bz.idm.bdp</groupId>
-            <artifactId>dc-interface</artifactId>
-            <version>8.0.0</version>
+            <groupId>com.opendatahub.timeseries.bdp</groupId>
+            <artifactId>client</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 

diff --git a/...sformers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/ChargePusher.java b/...sformers/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<ChargerDtoV2> 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
@@ -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
@@ -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/...mers/emobility-echarging/src/main/java/com/opendatahub/dc/echarging/dto/ChildPlugDto.java b/...mers/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/...sformers/emobility-echarging/src/test/java/com/opendatahub/dc/echarging/PusherTestIT.java b/...sformers/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
@@ -46,9 +46,9 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>it.bz.idm.bdp</groupId>
-            <artifactId>dc-interface</artifactId>
-            <version>8.0.0</version>
+            <groupId>com.opendatahub.timeseries.bdp</groupId>
+            <artifactId>client</artifactId>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.api-client</groupId>

diff --git a/...heet/src/main/java/com/opendatahub/transformer/spreadsheet/google/GenericTransformer.java b/...heet/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/...google-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/Main.java b/...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/...src/main/java/com/opendatahub/transformer/spreadsheet/google/StaEchargingTransformer.java b/...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/.../src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/DataTypeWrapperDto.java b/.../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/...sheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/dto/MappingResult.java b/...sheet/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<StationDto> stationDtos = new ArrayList<StationDto>();

diff --git a/...et/src/main/java/com/opendatahub/transformer/spreadsheet/google/mapper/DynamicMapper.java b/...et/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/...heet/src/main/java/com/opendatahub/transformer/spreadsheet/google/services/ODHClient.java b/...heet/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 <T> DataMapDto<RecordDtoImpl> mapData(T data) {
 	}
 
 	@Override
-	public String initIntegreenTypology() {
+	public String initStationType() {
 		return stationtype;
 	}
 

diff --git a/...e-spreadsheet/src/main/java/com/opendatahub/transformer/spreadsheet/google/util/Lang.java b/...e-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/...src/main/java/com/opendatahub/transformer/spreadsheet/google/util/LocationLookupUtil.java b/...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/...rmers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/OdhClient.java b/...rmers/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/...ers/meteorology-eurac/src/main/java/com/opendatahub/tr/meteorology/eurac/Transformer.java b/...ers/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 {