Master mergerd

buisnesslogic/src/main/java/com/plannaplan/services/UsosApiService.java

@@ -48,27 +48,28 @@ public class UsosApiService {
      * @return UserApiResponse modle contatining desired values
      */
     public UserApiResponse getUserData(String usosId) {
-        final UserApiResponse apiResponse = new UserApiResponse();
+	final UserApiResponse apiResponse = new UserApiResponse();
-        try {
+	try {
-            final OAuth10aService service = new ServiceBuilder(apikey).apiSecret(apisecret)
+	    final OAuth10aService service = new ServiceBuilder(apikey).apiSecret(apisecret)
-                    .build(UsosOauth1Service.instance());
+		.build(UsosOauth1Service.instance());
 
-            final OAuthRequest request = new OAuthRequest(Verb.GET, apiUrl + "/services/users/user?user_id=" + usosId);
+	    final OAuthRequest request = new OAuthRequest(Verb.GET, apiUrl + "/services/users/user?user_id=" + usosId);
-            service.signRequest(new OAuth1AccessToken("", ""), request);
+	    service.signRequest(new OAuth1AccessToken("", ""), request);
+	    try (Response response = service.execute(request)) {
+		final String json = response.getBody();
+		if (!json.equals("null")){
+		    final ObjectMapper mapper = new ObjectMapper();
+		    Map<String, String> map = mapper.readValue(json, new TypeReference<Map<String, String>>() {
+			});
+		    apiResponse.setName(map.get(NAME_FIELD));
+		    apiResponse.setSurname(map.get(SURNAME_FIELD));
+		}
+	    }
+	} catch (IOException | InterruptedException | ExecutionException e) {
+	    e.printStackTrace();
+	}
 
-            try (Response response = service.execute(request)) {
+	return apiResponse;
-                final String json = response.getBody();
-                final ObjectMapper mapper = new ObjectMapper();
-                Map<String, String> map = mapper.readValue(json, new TypeReference<Map<String, String>>() {
-                });
-                apiResponse.setName(map.get(NAME_FIELD));
-                apiResponse.setSurname(map.get(SURNAME_FIELD));
-            }
-        } catch (IOException | InterruptedException | ExecutionException e) {
-            e.printStackTrace();
-        }
-
-        return apiResponse;
     }
 
 }