Merge pull request #97 from cloud-of-things/develop

Release 2.0.0

Author: Andyck

DEVELOPER.md

@@ -67,7 +67,7 @@ Run the integration tests:
     export COT_TEST_CONNECTION_PASSWORD="your-password"
     export COT_TEST_CONNECTION_TENANT="your-tenant"
 
-    mvn integration-test
+    mvn -Dgpg.skip=true integration-test
 
 The integration tests require a Cloud of Things account. You must provide the credentials that are used for testing via environment variables before starting the integration tests.
 

README.md

@@ -2,7 +2,7 @@
 
 The [Cloud of Things](https://m2m.telekom.com/our-offering/cloud-of-things/) (German Cloud der Dinge) is a platform for the Internet of Things by T-Systems International GmbH. Inside this repository you will find a Java based SDK to interface with the Cloud of Things API.
 
-_Current version is: 1.1.0_
+_Current version is: 2.0.0_
 
 ## Usage
 
@@ -11,7 +11,7 @@ Add this to your `pom.xml` to include the SDK in your Maven Repo
 <dependency>
     <groupId>com.telekom.m2m.cot</groupId>
     <artifactId>java-rest-client</artifactId>
-    <version>1.1.0</version>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -33,6 +33,41 @@ You can find the Java Doc of the latest release here: http://cloud-of-things.git
 
 Short information about what has changed between releases.
 
+### Release 2.0.0
+
+* Measurement real time notification functionality was moved from InventoryApi to MeasurementApi
+* Prevent injection in update method ([Pull Request #90](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/90)). 
+* More robust deserialization catching IllegalArgumentException being thrown by Spring Boot Class Loader for properties like "A+:1" in ThreePhaseElectricityMeasurement
+([Pull Request #91](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/91)).
+    
+* Fix erroneously wrapped numeric values in deserialized ExtensibleObjects ([Pull Request #92](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/92)), e.g.:
+    serialized Object: temperature=ExtensibleObject{anyObject={unit=°C, value=100.0}} will be deserialized into:
+    ```
+    OLD:
+    "temperature":{
+        "value":{
+            "value":"100.0"
+        },
+        "unit":"°C"
+    }
+    
+    FIXED:
+    "temperature":{
+        "value":100.0,
+        "unit":"°C"
+    }
+    ```
+* Includes [Pull Request #94](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/94):
+    - Usage of newest dependencies
+    - Cleanup and improvements according to code inspection
+
+* EventApi provides the update of events as well now. ([Pull Request #95](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/95))
+* Fixed cast in getSource() method of Alarm and Event
+* Added the getter as counterpart of set(Object) in ExtendedObject
+* Includes ([Pull Request #96](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/96)):
+    - Fixed some unstable integration tests due to maybe changed behavior of the c8y API
+    - Provided more details from the c8y error message in CotSdkException
+
 ### Release 1.1.0
 
 * Includes [Pull Request #73](https://github.com/cloud-of-things/cot-java-rest-sdk/pull/73): Efficiently iterate over all objects in a collection via Java 8 Stream (accessible via `stream()`): pagination is automatically performed in the background

examples/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.telekom.m2m.cot</groupId>
     <artifactId>examples</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <name>Cloud of Things Java REST SDK Examples</name>
     <url>https://github.com/cloud-of-things/cot-java-rest-sdk</url>
@@ -39,6 +39,13 @@
         </developer>
     </developers>
 
+    <properties>
+        <license.licenseName>mit</license.licenseName>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -58,7 +65,7 @@
         <dependency>
             <groupId>com.telekom.m2m.cot</groupId>
             <artifactId>java-rest-client</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
     </dependencies>
 
@@ -67,6 +74,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.telekom.m2m.cot</groupId>
     <artifactId>java-rest-client</artifactId>
-    <version>1.1.0</version>
+    <version>2.0.0</version>
 
     <name>Cloud of Things Java REST SDK</name>
     <description>This is an SDK to interfere with the Cloud of Things by
@@ -39,7 +39,7 @@
             scm:git:git@github.com:cloud-of-things/cot-java-rest-sdk.git
         </developerConnection>
         <url>git@github.com:cloud-of-things/cot-java-rest-sdk.git</url>
-        <tag>java-rest-client-1.0.5</tag>
+        <tag>java-rest-client-2.0.0</tag>
     </scm>
 
     <distributionManagement>
@@ -70,21 +70,23 @@
 
     <properties>
         <license.licenseName>mit</license.licenseName>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <powermock.version>1.6.4</powermock.version>
+        <powermock.version>2.0.7</powermock.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.9.1</version>
+            <version>4.7.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.1</version>
+            <version>2.8.6</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305 -->
         <!-- Used for @Nullable and @Nonnull annotations. -->
@@ -97,13 +99,7 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>6.8.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>7.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -114,7 +110,7 @@
         </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <artifactId>powermock-api-mockito2</artifactId>
             <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
@@ -130,14 +126,10 @@
                 <version>2.13</version>
                 <executions>
                     <execution>
-                        <id>integration-test</id>
+                        <id>run-integration-tests</id>
+                        <phase>integration-test</phase>
                         <goals>
                             <goal>integration-test</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>verify</id>
-                        <goals>
                             <goal>verify</goal>
                         </goals>
                     </execution>
@@ -160,6 +152,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.9.1</version>
+                <configuration>
+                    <quiet>true</quiet>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

src/main/java/com/telekom/m2m/cot/restsdk/CloudOfThingsPlatform.java

@@ -1,10 +1,5 @@
 package com.telekom.m2m.cot.restsdk;
 
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.util.Base64;
-import java.util.concurrent.TimeUnit;
-
 import com.telekom.m2m.cot.restsdk.alarm.AlarmApi;
 import com.telekom.m2m.cot.restsdk.audit.AuditApi;
 import com.telekom.m2m.cot.restsdk.devicecontrol.CotCredentials;
@@ -19,9 +14,13 @@
 import com.telekom.m2m.cot.restsdk.retentionrule.RetentionRuleApi;
 import com.telekom.m2m.cot.restsdk.smartrest.SmartRestApi;
 import com.telekom.m2m.cot.restsdk.users.UserApi;
-
 import okhttp3.OkHttpClient;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.util.Base64;
+import java.util.concurrent.TimeUnit;
+
 /**
  * The CloudOfThingsPlatform is the starting point to access the Cloud of
  * Things.
@@ -40,7 +39,7 @@ public class CloudOfThingsPlatform {
      * new objects are built with: buildClient.newBuilder().build()
      */
     private static final OkHttpClient buildClient = new OkHttpClient();
-    private CloudOfThingsRestClient cloudOfThingsRestClient;
+    private final CloudOfThingsRestClient cloudOfThingsRestClient;
 
     /**
      * Get a platform object to register new devices. This should be used for