Commit 47631820 authored by jay pratap singh's avatar jay pratap singh
Browse files

changed/fixed and tested- create, update,list,activate,deactivate endpoints.

Showing with 33 additions and 21 deletions
+33 -21
...@@ -2,12 +2,6 @@ ...@@ -2,12 +2,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.15-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.tarento.upsmf</groupId> <groupId>com.tarento.upsmf</groupId>
<artifactId>userManagement</artifactId> <artifactId>userManagement</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
...@@ -15,6 +9,8 @@ ...@@ -15,6 +9,8 @@
<description>userManagement project for upsmf</description> <description>userManagement project for upsmf</description>
<properties> <properties>
<java.version>11</java.version> <java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
...@@ -32,18 +28,17 @@ ...@@ -32,18 +28,17 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>httpclient</artifactId>
<scope>test</scope> <version>4.5.13</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>5.3.29</version> <version>2.7.14</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.tuxdude.logback.extensions</groupId> <groupId>org.tuxdude.logback.extensions</groupId>
<artifactId>logback-colorizer</artifactId> <artifactId>logback-colorizer</artifactId>
......
package com.tarento.upsmf.userManagement.services; package com.tarento.upsmf.userManagement.services;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.http.HttpEntity; import org.springframework.http.*;
import org.springframework.http.HttpHeaders; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
...@@ -16,6 +18,9 @@ import java.net.URISyntaxException; ...@@ -16,6 +18,9 @@ import java.net.URISyntaxException;
@Component @Component
public class UserService { public class UserService {
private static final Logger logger = LoggerFactory.getLogger(UserService.class);
@Autowired @Autowired
private Environment env; private Environment env;
...@@ -24,6 +29,7 @@ public class UserService { ...@@ -24,6 +29,7 @@ public class UserService {
private HttpHeaders getHeader(){ private HttpHeaders getHeader(){
System.out.println(env.getProperty("BaseURL")); System.out.println(env.getProperty("BaseURL"));
logger.info("Getting headers...");
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON); headers.setContentType(MediaType.APPLICATION_JSON);
headers.add("Authorization","Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJSR3RkMkZzeG1EMnJER3I4dkJHZ0N6MVhyalhZUzBSSyJ9.kMLn6177rvY53i0RAN3SPD5m3ctwaLb32pMYQ65nBdA"); headers.add("Authorization","Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJSR3RkMkZzeG1EMnJER3I4dkJHZ0N6MVhyalhZUzBSSyJ9.kMLn6177rvY53i0RAN3SPD5m3ctwaLb32pMYQ65nBdA");
...@@ -32,23 +38,32 @@ public class UserService { ...@@ -32,23 +38,32 @@ public class UserService {
} }
public ResponseEntity<JsonNode> createUser(final JsonNode body) throws URISyntaxException { public ResponseEntity<JsonNode> createUser(final JsonNode body) throws URISyntaxException {
logger.info("Creating user...");
URI uri = new URI(BASE_URL + "/user/v1/sso/create"); URI uri = new URI(BASE_URL + "/user/v1/sso/create");
HttpHeaders headers = getHeader(); HttpHeaders headers = getHeader();
HttpEntity<JsonNode> httpEntity = new HttpEntity(body, headers); HttpEntity<JsonNode> httpEntity = new HttpEntity(body, headers);
ResponseEntity<JsonNode> result = restTemplate.postForEntity(uri,httpEntity,JsonNode.class); ResponseEntity<JsonNode> result = restTemplate.postForEntity(uri,httpEntity,JsonNode.class);
return result; return result;
} }
public ResponseEntity<JsonNode> updateUser(final JsonNode body) throws URISyntaxException {
public ResponseEntity<JsonNode> updateUser(final JsonNode body) throws URISyntaxException{ logger.info("Updating user...");
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
// Create HttpClient with PATCH support
HttpClient httpClient = HttpClientBuilder.create().build();
HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
restTemplate.setRequestFactory(requestFactory);
URI uri = new URI(BASE_URL + "/user/v1/update"); URI uri = new URI(BASE_URL + "/user/v1/update");
HttpHeaders headers = getHeader(); HttpHeaders headers = getHeader();
HttpEntity httpEntity = new HttpEntity(body, headers); HttpEntity<JsonNode> httpEntity = new HttpEntity<>(body, headers);
ResponseEntity<JsonNode> result = restTemplate.postForEntity(uri,httpEntity,JsonNode.class); ResponseEntity<JsonNode> result = restTemplate.exchange(uri, HttpMethod.PATCH, httpEntity, JsonNode.class);
return result; return result;
} }
public ResponseEntity<JsonNode> listUser(final JsonNode body) throws URISyntaxException{ public ResponseEntity<JsonNode> listUser(final JsonNode body) throws URISyntaxException{
logger.info("Listing users...");
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
URI uri = new URI(BASE_URL + "/user/v1/search"); URI uri = new URI(BASE_URL + "/user/v1/search");
HttpHeaders headers = getHeader(); HttpHeaders headers = getHeader();
...@@ -58,6 +73,7 @@ public class UserService { ...@@ -58,6 +73,7 @@ public class UserService {
} }
public ResponseEntity<JsonNode> activateUser(final JsonNode body) throws URISyntaxException{ public ResponseEntity<JsonNode> activateUser(final JsonNode body) throws URISyntaxException{
logger.info("Activating user...");
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
URI uri = new URI(BASE_URL + "/user/v1/unblock"); URI uri = new URI(BASE_URL + "/user/v1/unblock");
HttpHeaders headers = getHeader(); HttpHeaders headers = getHeader();
...@@ -67,6 +83,7 @@ public class UserService { ...@@ -67,6 +83,7 @@ public class UserService {
} }
public ResponseEntity<JsonNode> deactivateUser(final JsonNode body) throws URISyntaxException { public ResponseEntity<JsonNode> deactivateUser(final JsonNode body) throws URISyntaxException {
logger.info("Deactivating user...");
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
URI uri = new URI(BASE_URL + "/user/v1/block"); URI uri = new URI(BASE_URL + "/user/v1/block");
HttpHeaders headers = getHeader(); HttpHeaders headers = getHeader();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment