Release 1.0.32

Author: predix-adoption-bot

LICENSE.md

@@ -2,7 +2,7 @@
 applications:
   - name: {your-name}-kit-service
     buildpack: java_buildpack
-    path: target/kit-service-1.0.26.jar
+    path: target/kit-service-1.0.32.jar
     memory: 512M
     timeout : 180
 services:

manifest.yml

@@ -2,7 +2,7 @@
 applications:
   - name: {your-name}-kit-service
     buildpack: java_buildpack
-    path: target/kit-service-1.0.26.jar
+    path: target/kit-service-1.0.32.jar
     memory: 512M
     timeout : 180
 services:

manifest.yml.template

@@ -5,7 +5,7 @@
 
 	<groupId>com.ge.predix.solsvc</groupId>
 	<artifactId>kit-service</artifactId>
-	<version>1.0.26</version>
+	<version>1.0.32</version>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -15,8 +15,10 @@
 	</parent>
 
 	<properties>
-		<fdh-asset-handler.version>2.0.35</fdh-asset-handler.version>
-		<timeseries-bootstrap.version>2.1.34</timeseries-bootstrap.version>
+	
+		<asset-bootstrap-client.version>2.0.54</asset-bootstrap-client.version>
+		<fdh-asset-handler.version>2.0.64</fdh-asset-handler.version>
+		<timeseries-bootstrap.version>2.1.67</timeseries-bootstrap.version>
 		<uaa-lib.version>3.2.2</uaa-lib.version>
 
 		<jetty.version>8.1.7.v20120910</jetty.version>
@@ -106,6 +108,12 @@
 			<artifactId>timeseries-bootstrap</artifactId>
 			<version>${timeseries-bootstrap.version}</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>com.ge.predix.solsvc</groupId>
+			<artifactId>asset-bootstrap-client</artifactId>
+			<version>${asset-bootstrap-client.version}</version>
+		</dependency>
 
 		<dependency>
 		  <groupId>org.freemarker</groupId>
@@ -305,6 +313,18 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>${maven-javadoc-plugin.version}</version>
+				<executions>
+				<execution>
+				    <id>attach-javadocs</id>
+				    <goals>
+					<goal>jar</goal>
+				    </goals>
+				    <configuration> <!-- add this to disable checking -->
+					<additionalparam>-Xdoclint:none</additionalparam>
+				    </configuration>
+				</execution>
+			    </executions>
+
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

pom.xml

@@ -82,11 +82,11 @@ public void activate() {
 	}
 
 	/**
-	 * @param device
-	 *            -
+	 * gets the asset file name
+	 * @param device : is a registered Device
+	 * 
 	 * @return -
-	 * @throws IOException
-	 *             -
+	 * 
 	 */
 	public String getAssetCSV(RegisterDevice device) {
 		Map<String, Object> root = new HashMap<>();
@@ -142,11 +142,10 @@ public String getAssetCSV(RegisterDevice device) {
 	}
 
 	/**
-	 * @param devices
-	 *            -
+	 * @param devices : list of registered devices
+	 * 
 	 * @return -
-	 * @throws IOException
-	 *             -
+	 *
 	 */
 	public String getAssetCSV(List<RegisterDevice> devices) {
 		Map<String, Object> root = new HashMap<>();

src/main/java/com/ge/predix/solsvc/kitservice/boot/utils/CSVWriter.java

@@ -85,10 +85,7 @@ private static PutFieldDataCriteria getFieldCriteria(String dataString) {
 	 *            -
 	 * @param expectedDataType
 	 *            -
-	 * @param deviceIdentifier
-	 *            -
-	 * @param string
-	 *            -
+	 * 
 	 * @param userId
 	 *            -
 	 * @param deviceAddress
@@ -136,13 +133,13 @@ public static GetFieldDataRequest createGetUserDeviceRequest(String filterFieldV
 	}
 
 	/**
+	 * Method that creates a get request for getting device groups of a device
 	 * 
 	 * @param groupRef
 	 *            -
 	 * @param expectedDataType
 	 *            -
-	 * @param userId
-	 *            -
+	 * 
 	 * @return -
 	 */
 	public static GetFieldDataRequest createGetGroupRequest(String groupRef, String expectedDataType) {
@@ -172,10 +169,10 @@ public static GetFieldDataRequest createGetGroupRequest(String groupRef, String
 	}
 
 	/**
+	 * Method that creates a get request for getting userGroups
+	 * 
 	 * @param userGroupRef
 	 *            -
-	 * @param deviceGroupRef
-	 *            -
 	 * @param expectedDataType
 	 *            -
 	 * @param userId

src/main/java/com/ge/predix/solsvc/kitservice/boot/utils/FdhUtils.java

@@ -3,6 +3,8 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -12,6 +14,8 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.Header;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +32,7 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -67,31 +72,30 @@ public KitController() {
 	}
 
 	/**
-	 * Sample End point which returns a Welcome Message
+	 * Method that returns the devices for an admin or for a user if userId is
+	 * passed
 	 * 
 	 * @param request
 	 *            -
 	 * @param authorization
 	 *            -
-	 * 
-	 * @param echo
-	 *            - the string to echo back
 	 * @return -
 	 */
 	@SuppressWarnings({ "resource" })
 	@RequestMapping(value = "/device", method = RequestMethod.GET, produces = { MediaType.APPLICATION_JSON_VALUE,
 			MediaType.APPLICATION_XHTML_XML_VALUE })
 	public ResponseEntity<?> getDevices(HttpServletRequest request,
 			@RequestHeader("Authorization") String authorization) {
+		// log.info("calling /device method API call");
 		List<RegisterDevice> devices = null;
 		String userId = getUserId(request);
 		Boolean isAdmin = (Boolean) request.getAttribute("isAdmin"); //$NON-NLS-1$
 
 		if (isAdmin) {
 			devices = this.deviceManager.getAllAdminDevices();
-		} else {
+		} else
 			devices = this.deviceManager.getDevices(userId);
-		}
+
 		String contentType = request.getHeader("Content-Type"); //$NON-NLS-1$
 
 		if (contentType != null && MediaType.APPLICATION_OCTET_STREAM_VALUE.equals(contentType)) {
@@ -137,13 +141,15 @@ public ResponseEntity<?> registerDevice(@RequestBody RegisterDevice device, Http
 			return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST);
 		}
 		// continue to register device
-		// RegisterDevice originalDevice = this.deviceManager.getDevice("device", userId, device.getDeviceAddress());//$NON-NLS-1$
+		// RegisterDevice originalDevice =
+		// this.deviceManager.getDevice("device",
+		// userId, device.getDeviceAddress());//$NON-NLS-1$
 		// removing the user check adding check per deviceIdentifer
 		RegisterDevice originalDevice = this.deviceManager.getDevice("device", null, device.getDeviceAddress());//$NON-NLS-1$
 		try {
 			if (originalDevice == null) {
 				// device not found. register it.
-				log.info("Registrating device with address " + device.getDeviceAddress()); //$NON-NLS-1$
+				log.info("Registering device with address " + device.getDeviceAddress()); //$NON-NLS-1$
 				this.deviceManager.registerDevice(device, userId);
 			} else {
 				log.info("This is a registered device with address " + device.getDeviceAddress()); //$NON-NLS-1$
@@ -308,23 +314,15 @@ private String getUserId(HttpServletRequest request) {
 		return this.deviceManager.getUserId(accessToken);
 	}
 
-
-
 	/**
 	 * Details about each Device
 	 * 
 	 * @param deviceId
 	 *            -
-	 * @param model
-	 *            -
 	 * @param request
 	 *            -
 	 * @param authorization
 	 *            -
-	 * @param result
-	 *            -
-	 * @param echo
-	 *            -
 	 * @return -
 	 */
 	@RequestMapping(value = "/device/{deviceId}", method = RequestMethod.GET)
@@ -383,24 +381,20 @@ public ResponseEntity<?> getDevice(@PathVariable String deviceId, HttpServletReq
 				file.delete();
 			}
 		}
-		return new ResponseEntity<RegisterDevice>(device, HttpStatus.OK);	}
-
-
+		return new ResponseEntity<RegisterDevice>(device, HttpStatus.OK);
+	}
 
 	/**
 	 * This method resets the Device settings.
 	 * 
 	 * @param deviceId
 	 *            -
-	 * @param device
-	 *            -
 	 * @param request
 	 *            -
-	 * @param result
-	 *            -
 	 * @param authorization
 	 *            -
 	 * @return -
+	 * 
 	 */
 	@RequestMapping(value = "/device/reset/{deviceId}", method = RequestMethod.PUT)
 	public ResponseEntity<?> resetRegisterDevice(@PathVariable String deviceId, HttpServletRequest request,
@@ -428,8 +422,17 @@ public ResponseEntity<?> resetRegisterDevice(@PathVariable String deviceId, Http
 			// continue with get device without user
 			RegisterDevice device = this.deviceManager.getDevice(deviceId, null);
 			if (device != null) {
+
 				Boolean isAdmin = (Boolean) request.getAttribute("isAdmin"); //$NON-NLS-1$
-				this.deviceManager.resetDeviceActivation(device, isAdmin, userId);
+
+				try {
+					this.deviceManager.resetDeviceActivation(device, isAdmin, userId);
+				} catch (IOException e) {
+					log.error("KitController: Asset model could not be reset. ", e);
+					throw new RuntimeException("KitController: Exception when resetting the device", e);
+					// return new ResponseEntity<>(eventErrors, HttpStatus.);
+				}
+
 			}
 
 		} catch (DeviceRegistrationError e) {