stackify
diff --git a/‎src/main/java/com/stackify/api/common/AppIdentityService.java‎
Lines changed: 43 additions & 1 deletion b/‎src/main/java/com/stackify/api/common/AppIdentityService.java‎
Lines changed: 43 additions & 1 deletion
diff --git a/‎src/test/java/com/stackify/api/common/AppIdentityServiceTest.java‎
Lines changed: 1 addition & 1 deletion b/‎src/test/java/com/stackify/api/common/AppIdentityServiceTest.java‎
Lines changed: 1 addition & 1 deletion
@@ -61,6 +61,11 @@ public class AppIdentityService {
 	 * Jackson object mapper
 	 */
 	private final ObjectMapper objectMapper;
+	
+	/**
+	 * True if deviceAppId is required in the response
+	 */
+	private final boolean deviceAppIdRequired;
 
 	/**
 	 * Constructor
@@ -73,6 +78,22 @@ public AppIdentityService(final ApiConfiguration apiConfig, final ObjectMapper o
 
 		this.defaultApiConfig = apiConfig;
 		this.objectMapper = objectMapper;
+		this.deviceAppIdRequired = false;
+	}
+	
+	/**
+	 * Constructor
+	 * @param apiConfig The API configuration
+	 * @param objectMapper Jackson object mapper
+	 * @param deviceAppIdRequired True if deviceAppId is required in the response
+	 */
+	public AppIdentityService(final ApiConfiguration apiConfig, final ObjectMapper objectMapper, final boolean deviceAppIdRequired) {
+		Preconditions.checkNotNull(apiConfig);
+		Preconditions.checkNotNull(objectMapper);
+
+		this.defaultApiConfig = apiConfig;
+		this.objectMapper = objectMapper;
+		this.deviceAppIdRequired = deviceAppIdRequired;
 	}
 
 	/**
@@ -154,13 +175,34 @@ private AppIdentity identifyApp(ApiConfiguration apiConfig) throws IOException,
 		// convert to json bytes
 		byte[] jsonBytes = objectMapper.writer().writeValueAsBytes(apiConfig.getEnvDetail());
 
+		if (LOGGER.isDebugEnabled())
+		{
+			LOGGER.debug("IdentifyApp Request: {}", new String(jsonBytes, "UTF-8"));
+		}
+		
 		// post to stackify
 		final HttpClient httpClient = new HttpClient(apiConfig);
 		final String responseString = httpClient.post("/Metrics/IdentifyApp", jsonBytes);
 
+		LOGGER.debug("IdentifyApp Response: {}", responseString);
+		
 		// deserialize the response and return the app identity
 		ObjectReader jsonReader = objectMapper.reader(new TypeReference<AppIdentity>(){});
-		return jsonReader.readValue(responseString);
+		AppIdentity identity = jsonReader.readValue(responseString);
+		
+		// make sure it has a valid DeviceAppID before accepting it
+		
+		if (deviceAppIdRequired)
+		{
+			if (identity.getDeviceAppId() == null)
+			{
+				throw new NullPointerException("DeviceAppId is null");
+			}
+		}
+		
+		// done
+		
+		return identity;
 	}
 
 
 
@@ -47,7 +47,7 @@ public void testGetAppIdentity() throws Exception {
 			EnvironmentDetail.newBuilder().deviceName("device").appName("app").build();
 
 		final AppIdentity appIdentity =
-			AppIdentity.newBuilder().deviceId(123).appNameId("456").appName("app").build();
+			AppIdentity.newBuilder().deviceId(123).deviceAppId(789).appNameId("456").appName("app").build();
 
 		final ObjectMapper objectMapper = new ObjectMapper();