Release 2.0.82

PredixDev · Mar 15, 2019 · 345c255 · 345c255
1 parent bc5c64c
commit 345c255
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 38 deletions.
diff --git a/data-exchange-client/pom.xml b/data-exchange-client/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.ge.predix.solsvc</groupId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<artifactId>data-exchange-client</artifactId>
 	<packaging>jar</packaging>
 
 	<properties>
-		<ext-model.version>2.4.13</ext-model.version>
+		<ext-model.version>2.4.16</ext-model.version>
 
 		<spring.version>4.1.6.RELEASE</spring.version>
 		<httpclient.version>4.5.2</httpclient.version>

diff --git a/data-exchange-edgemanager-handler/pom.xml b/data-exchange-edgemanager-handler/pom.xml
@@ -4,12 +4,12 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>data-exchange-edgemanager-handler</artifactId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<packaging>jar</packaging>
 
 	<properties>
-		<ext-model.version>2.4.13</ext-model.version>
-		<ext-util.version>2.4.13</ext-util.version>
+		<ext-model.version>2.4.16</ext-model.version>
+		<ext-util.version>2.4.16</ext-util.version>
 		<predix-rest-client.version>2.3.91</predix-rest-client.version>
 		<spring.version>4.1.6.RELEASE</spring.version>
 		<commons-httpclient.version>3.1</commons-httpclient.version>

diff --git a/fdh-adapter/pom.xml b/fdh-adapter/pom.xml
@@ -4,13 +4,13 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>fdh-adapter</artifactId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<packaging>jar</packaging>
 
 	<properties>
 		<spring.version>4.1.6.RELEASE</spring.version>
-		<ext-model.version>2.4.13</ext-model.version>
-		<ext-util.version>2.4.13</ext-util.version>
+		<ext-model.version>2.4.16</ext-model.version>
+		<ext-util.version>2.4.16</ext-util.version>
 		<commons-httpclient.version>3.1</commons-httpclient.version>
 		<httpclient.version>4.5.2</httpclient.version>
 

diff --git a/fdh-asset-handler/pom.xml b/fdh-asset-handler/pom.xml
@@ -4,13 +4,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>fdh-asset-handler</artifactId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<packaging>jar</packaging>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<fdh-adapter.version>2.0.81</fdh-adapter.version>
-		<asset-bootstrap-client.version>2.0.72</asset-bootstrap-client.version>
+		<fdh-adapter.version>2.0.82</fdh-adapter.version>
+		<asset-bootstrap-client.version>2.0.75</asset-bootstrap-client.version>
 
 		<spring.version>4.1.6.RELEASE</spring.version>
 		<httpclient.version>4.5.2</httpclient.version>

diff --git a/...andler/src/main/java/com/ge/predix/solsvc/fdh/handler/asset/AssetPutDataFileExecutor.java b/...andler/src/main/java/com/ge/predix/solsvc/fdh/handler/asset/AssetPutDataFileExecutor.java
@@ -34,8 +34,8 @@
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
+import com.ge.predix.entity.data.Data;
 import com.ge.predix.entity.datafile.DataFile;
-import com.ge.predix.entity.fielddata.Data;
 import com.ge.predix.entity.model.Model;
 import com.ge.predix.entity.putfielddata.PutFieldDataCriteria;
 import com.ge.predix.entity.putfielddata.PutFieldDataResult;

diff --git a/...handler/src/main/java/com/ge/predix/solsvc/fdh/handler/asset/AssetPutDataHandlerImpl.java b/...handler/src/main/java/com/ge/predix/solsvc/fdh/handler/asset/AssetPutDataHandlerImpl.java
@@ -37,10 +37,10 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.ge.predix.entity.asset.AssetList;
 import com.ge.predix.entity.assetfilter.AssetFilter;
+import com.ge.predix.entity.data.Data;
 import com.ge.predix.entity.datafile.DataFile;
 import com.ge.predix.entity.engunit.EngUnit;
 import com.ge.predix.entity.field.Field;
-import com.ge.predix.entity.fielddata.Data;
 import com.ge.predix.entity.fielddata.OsaData;
 import com.ge.predix.entity.fielddata.PredixString;
 import com.ge.predix.entity.metadata.MetaData;

diff --git a/.../main/java/com/ge/predix/solsvc/fdh/handler/asset/data/updater/ModelAttributeUpdater.java b/.../main/java/com/ge/predix/solsvc/fdh/handler/asset/data/updater/ModelAttributeUpdater.java
@@ -13,7 +13,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -35,11 +34,10 @@
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.stereotype.Component;
 
+import com.ge.predix.entity.data.Data;
 import com.ge.predix.entity.engunit.EngUnit;
 import com.ge.predix.entity.field.fieldidentifier.FieldIdentifier;
-import com.ge.predix.entity.fielddata.Data;
 import com.ge.predix.entity.fielddata.FieldData;
-import com.ge.predix.entity.fielddata.OsaData;
 import com.ge.predix.entity.fielddata.PredixString;
 import com.ge.predix.entity.fielddatacriteria.FieldDataCriteria;
 import com.ge.predix.entity.model.Model;

diff --git a/...src/test/java/com/ge/predix/solsvc/fdh/asset/processor/GetAndPutFieldDataHandlerTest.java b/...src/test/java/com/ge/predix/solsvc/fdh/asset/processor/GetAndPutFieldDataHandlerTest.java
@@ -38,6 +38,8 @@
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ActiveProfiles;
@@ -61,6 +63,7 @@
 import com.ge.predix.solsvc.ext.util.JsonMapper;
 import com.ge.predix.solsvc.fdh.handler.GetDataHandler;
 import com.ge.predix.solsvc.fdh.handler.PutDataHandler;
+import com.ge.predix.solsvc.fdh.handler.asset.AssetPutDataFileExecutor;
 import com.ge.predix.solsvc.restclient.impl.RestClient;
 
 /**
@@ -84,6 +87,8 @@
 public class GetAndPutFieldDataHandlerTest 
 {
 
+	private static final Logger log = LoggerFactory.getLogger(GetAndPutFieldDataHandlerTest.class);
+
     /**
      * Processor for GetFieldData request
      */
@@ -556,11 +561,14 @@ private PutFieldDataRequest createPutRequestNoFilterForModelList()
         ModelList list = new ModelList();
         String json = this.jsonMapper.toJson(list);
         SampleEngine model2 =new SampleEngine();
+        log.debug("here" + model2);
         model2.setAdditionalAttributes(new com.ge.predix.entity.util.map.Map());
         model2.getAdditionalAttributes().put("key", "value");
         json = this.jsonMapper.toJson(model2);
         list.getModel().add(model2);
         json = this.jsonMapper.toJson(list);
+       ModelList list2 = new ModelList();
+		log.debug(list2.toString());
 		Object obj = this.jsonMapper.fromJson(json, ModelList.class);
 
         fieldData.setData(list);

diff --git a/fdh-blobstore-handler/pom.xml b/fdh-blobstore-handler/pom.xml
@@ -4,16 +4,16 @@
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>fdh-blobstore-handler</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>1.2.3.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<properties>
-		<ext-util.version>2.4.13</ext-util.version>
-		<blobstore-bootstrap.version>2.0.66</blobstore-bootstrap.version>
+		<ext-util.version>2.4.16</ext-util.version>
+		<blobstore-bootstrap.version>2.0.67</blobstore-bootstrap.version>
 
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/fdh-custom-handler/pom.xml b/fdh-custom-handler/pom.xml
@@ -4,11 +4,11 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>fdh-custom-handler</artifactId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<packaging>jar</packaging>
 
 	<properties>
-		<ext-model.version>2.4.13</ext-model.version>
+		<ext-model.version>2.4.16</ext-model.version>
 
 		<spring.version>4.1.6.RELEASE</spring.version>
 		<commons-httpclient.version>3.1</commons-httpclient.version>

diff --git a/fdh-eventhub-handler/pom.xml b/fdh-eventhub-handler/pom.xml
@@ -3,16 +3,16 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.ge.predix.solsvc</groupId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<artifactId>fdh-eventhub-handler</artifactId>
 	<packaging>jar</packaging>
 
 	<properties>
 		<predix-rest-client.version>2.3.91</predix-rest-client.version>
 		<eventhub.sdk.version>2.0.1</eventhub.sdk.version>
-		<ext-model.version>2.4.13</ext-model.version>
-		<ext-util.version>2.4.13</ext-util.version>
-		<fdh-timeseries-handler.version>2.0.81</fdh-timeseries-handler.version>
+		<ext-model.version>2.4.16</ext-model.version>
+		<ext-util.version>2.4.16</ext-util.version>
+		<fdh-timeseries-handler.version>2.0.82</fdh-timeseries-handler.version>
 
 		<httpclient.version>4.5.2</httpclient.version>
 		<spring.version>4.1.6.RELEASE</spring.version>

diff --git a/fdh-rabbitmq-handler/pom.xml b/fdh-rabbitmq-handler/pom.xml
@@ -3,12 +3,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>fdh-rabbitmq-handler</artifactId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<packaging>jar</packaging>
 
 	<properties>
-		<ext-model.version>2.4.13</ext-model.version>
-		<ext-util.version>2.4.13</ext-util.version>
+		<ext-model.version>2.4.16</ext-model.version>
+		<ext-util.version>2.4.16</ext-util.version>
 
 		<spring.version>4.1.6.RELEASE</spring.version>
 		<springboot.version>1.2.3.RELEASE</springboot.version>

diff --git a/fdh-timeseries-handler/pom.xml b/fdh-timeseries-handler/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.ge.predix.solsvc</groupId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<artifactId>fdh-timeseries-handler</artifactId>
 	<packaging>jar</packaging>
 
 	<properties>
-		<timeseries-bootstrap.version>2.1.89</timeseries-bootstrap.version>
-		<fdh-asset-handler.version>2.0.81</fdh-asset-handler.version>
+		<timeseries-bootstrap.version>2.1.90</timeseries-bootstrap.version>
+		<fdh-asset-handler.version>2.0.82</fdh-asset-handler.version>
 
 		<httpclient.version>4.5.2</httpclient.version>
 		<spring.version>4.1.6.RELEASE</spring.version>

diff --git a/...r/src/main/java/com/ge/predix/solsvc/fdh/handler/timeseries/TimeseriesGetDataHandler.java b/...r/src/main/java/com/ge/predix/solsvc/fdh/handler/timeseries/TimeseriesGetDataHandler.java
@@ -5,7 +5,6 @@
 import java.util.Map;
 
 import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +13,8 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
+import com.ge.predix.entity.data.Data;
 import com.ge.predix.entity.field.Field;
-import com.ge.predix.entity.fielddata.Data;
 import com.ge.predix.entity.fielddata.FieldData;
 import com.ge.predix.entity.fielddata.OsaData;
 import com.ge.predix.entity.fielddatacriteria.AssetFieldDataCriteria;

diff --git a/fdh-websocket-handler/pom.xml b/fdh-websocket-handler/pom.xml
@@ -4,13 +4,13 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>fdh-websocket-handler</artifactId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<packaging>jar</packaging>
 
 	<properties>
-		<data-exchange-client.version>2.0.81</data-exchange-client.version>
-		<ext-model.version>2.4.13</ext-model.version>
-		<ext-util.version>2.4.13</ext-util.version>
+		<data-exchange-client.version>2.0.82</data-exchange-client.version>
+		<ext-model.version>2.4.16</ext-model.version>
+		<ext-util.version>2.4.16</ext-util.version>
 
 
 		<spring.version>4.1.6.RELEASE</spring.version>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>fdh-router-service</artifactId>
-	<version>2.0.81</version>
+	<version>2.0.82</version>
 	<packaging>pom</packaging>
 
 	<modules>