removed usage of Open Saber Repositories

src/main/java/org/sunbird/cb/hubservices/model/ConnectionRequest.java

@@ -4,10 +4,47 @@ public class ConnectionRequest {
 
 	private String userIdFrom;
 	private String userIdTo;
+
+	private String userNameFrom;
+	private String userNameTo;
+	private String userDepartmentFrom;
+	private String userDepartmentTo;
 	private String status;
 	private String createdAt;
 	private String updatedAt;
 
+	public String getUserNameFrom() {
+		return userNameFrom;
+	}
+
+	public void setUserNameFrom(String userNameFrom) {
+		this.userNameFrom = userNameFrom;
+	}
+
+	public String getUserNameTo() {
+		return userNameTo;
+	}
+
+	public void setUserNameTo(String userNameTo) {
+		this.userNameTo = userNameTo;
+	}
+
+	public String getUserDepartmentFrom() {
+		return userDepartmentFrom;
+	}
+
+	public void setUserDepartmentFrom(String userDepartmentFrom) {
+		this.userDepartmentFrom = userDepartmentFrom;
+	}
+
+	public String getUserDepartmentTo() {
+		return userDepartmentTo;
+	}
+
+	public void setUserDepartmentTo(String userDepartmentTo) {
+		this.userDepartmentTo = userDepartmentTo;
+	}
+
 	public String getCreatedAt() {
 		return createdAt;
 	}

src/main/java/org/sunbird/cb/hubservices/model/Node.java

@@ -3,11 +3,34 @@
 public class Node {
 
 	private String id;
+	private String name;
+	private String departmentName;
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDepartmentName() {
+		return departmentName;
+	}
+
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
 
 	public Node(String id) {
 		this.id = id;
 	}
 
+	public Node(String id, String name, String departmentName) {
+		this.id = id;
+		this.name = name;
+		this.departmentName = departmentName;
+	}
+
 	public String getId() {
 		return id;
 	}

src/main/java/org/sunbird/cb/hubservices/model/RegistryRequest.java

@@ -0,0 +1,27 @@
+package org.sunbird.cb.hubservices.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RegistryRequest {
+
+	private String id;
+
+	private Map<String, Object> request = new HashMap<>();
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Map<String, Object> getRequest() {
+		return request;
+	}
+
+	public void setRequest(Map<String, Object> request) {
+		this.request = request;
+	}
+}

src/main/java/org/sunbird/cb/hubservices/profile/handler/ProfileUtils.java

@@ -1,3 +1,4 @@
+
 package org.sunbird.cb.hubservices.profile.handler;
 
 import java.util.ArrayList;
@@ -12,7 +13,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -21,6 +21,7 @@
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import org.sunbird.cb.hubservices.model.RegistryRequest;
 import org.sunbird.cb.hubservices.util.ConnectionProperties;
 import org.sunbird.cb.hubservices.util.Constants;
 
@@ -34,9 +35,6 @@ public class ProfileUtils {
 
 	private Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
 
-	@Value(value = "${user.registry.ip}")
-	String baseUrl;
-
 	@Autowired
 	private ConnectionProperties connectionProperties;
 
@@ -49,21 +47,6 @@ public static List<String> getUserDefaultFields() {
 		return userFields;
 	}
 
-	public enum API {
-		CREATE("open-saber.registry.create"), READ("open-saber.registry.read"), SEARCH("open-saber.registry.search"),
-		UPDATE("open-saber.registry.update");
-
-		private String value;
-
-		private API(String value) {
-			this.value = value;
-		}
-
-		public String getValue() {
-			return this.value;
-		}
-	}
-
 	public enum URL {
 		CREATE("/add"), READ("/read"), SEARCH("/search"), UPDATE("/update");
 
@@ -155,25 +138,16 @@ public static void mergeLeaf(Map<String, Object> mapLeft, Map<String, Object> ma
 	public static ResponseEntity getResponseEntity(String baseUrl, String endPoint, RegistryRequest registryRequest) {
 		HttpHeaders requestHeaders = new HttpHeaders();
 		requestHeaders.add(Constants.ACCEPT, MediaType.APPLICATION_JSON_VALUE);
+		requestHeaders.add("Authorization",
+				"bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJRekw4VVA1dUtqUFdaZVpMd1ZtTFJvNHdqWTg2a2FrcSJ9.TPjV0xLacSbp3FbJ7XeqHoKFN35Rl4YHx3DZNN9pm0o");
+		requestHeaders.add("X-Authenticated-User-Token","eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJVMkpUdlpERFY4eG83ZmtfNHd1Yy1kNVJmNjRPTG1oemlRRUhjR25Vc2hNIn0.eyJqdGkiOiJiYTliZGUwNC1iNWUyLTQwYjUtYTcwZi0yNDliZWU1NDM1ODQiLCJleHAiOjE2NTM1OTI1MTQsIm5iZiI6MCwiaWF0IjoxNjUzNTA2MTE0LCJpc3MiOiJodHRwczovL2lnb3QtZGV2LmluL2F1dGgvcmVhbG1zL3N1bmJpcmQiLCJzdWIiOiJmOjkyM2JkYzE4LTUyMGQtNDhkNC1hODRlLTNjZGUxZTY1NWViZDpkYTliNTRjYi03NjM1LTQwMTYtYTU0My1hMWYzZmIyZmFiOGMiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJhZG1pbi1jbGkiLCJhdXRoX3RpbWUiOjAsInNlc3Npb25fc3RhdGUiOiIxMDIwYzgyNS00ZmFlLTQ2NzgtYThhYS1lYTkxMWNkMTFlODEiLCJhY3IiOiIxIiwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInNjb3BlIjoiIiwibmFtZSI6Ikp1aGkgQ0JQIEFkbWluIiwicHJlZmVycmVkX3VzZXJuYW1lIjoianVoaWNicGFkbWluX3ZjcGgiLCJnaXZlbl9uYW1lIjoiSnVoaSIsImZhbWlseV9uYW1lIjoiQ0JQIEFkbWluIiwiZW1haWwiOiJqdSoqKioqKipAeW9wbWFpbC5jb20ifQ.O_fYueeKl9RGflVVcpjcFyfVKL6ZOLVqGUAtOJlHXVVaR9YmCxdXtyvVsCn-w1VZ5x-HZtxKk9EXBHlXZYUh9nIOQFjDW1h64IHpoUzcdQINAsurQNM-z7ba5BPxe2i3Rly0W-5oYODm5GYz8mrMv3pmnq5r3IaFxHDqwYvDsQBLCdAxy1r4r8_lKFrKcqPxOLIL92fqOmGbVtsR8XkGO5g1fYS6C5iWAQg8TwVRvbVmLgOKIpl4I4kFG8WiSonEcL8TgCU5bZO7ghj1NwL-bMdf3CfzInP0-m2Kf3jOVU3hs1PHTQGyctv77_cSaQKLlGNJskzesIK0Gt_Y_tw0bw");
 		HttpEntity<RegistryRequest> requestEntity = new HttpEntity<>(registryRequest, requestHeaders);
 		ResponseEntity responseEntity = restTemplate.exchange(baseUrl + endPoint, HttpMethod.POST, requestEntity,
 				Map.class);
 
 		return new ResponseEntity<>(responseEntity.getBody(), responseEntity.getStatusCode());
 	}
 
-	public ResponseEntity getResponseEntity(String endPoint, RegistryRequest registryRequest) {
-		HttpHeaders requestHeaders = new HttpHeaders();
-		requestHeaders.add(Constants.ACCEPT, MediaType.APPLICATION_JSON_VALUE);
-
-		HttpEntity<RegistryRequest> requestEntity = new HttpEntity<>(registryRequest, requestHeaders);
-
-		ResponseEntity responseEntity = restTemplate.exchange(baseUrl + endPoint, HttpMethod.POST, requestEntity,
-				Map.class);
-
-		return new ResponseEntity<>(responseEntity.getBody(), responseEntity.getStatusCode());
-	}
-
 	public List<Map<String, Object>> getUserProfiles(List<String> userIds) {
 		StringBuilder builder = new StringBuilder();
 		HttpHeaders requestHeaders = new HttpHeaders();