GMS client bugfix (cf908b5b) · Commits · IA2 / GMS

gms-client/gms-cli/gms.properties

+1 −1

Original line number	Original line	Diff line number	Diff line
	base_url=http://localhost:8081		base_url=http://localhost:8081/gms
	client_id=test		client_id=test
	client_secret=test		client_secret=test

gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -69,28 +69,28 @@ public class CLI implements CommandLineRunner {
	if (args.length < 3) {		if (args.length < 3) {
	displayUsage();		displayUsage();
	}		}
	client.addMember(getNames(args, args.length - 2), args[args.length - 1]);		client.addMember(getNames(args, 1, args.length - 2), args[args.length - 1]);
	System.out.println("Member added");		System.out.println("Member added");
	break;		break;
	case "remove-member":		case "remove-member":
	if (args.length < 3) {		if (args.length < 3) {
	displayUsage();		displayUsage();
	}		}
	client.removeMember(getNames(args, args.length - 2), args[args.length - 1]);		client.removeMember(getNames(args, 1, args.length - 2), args[args.length - 1]);
	System.out.println("Member removed");		System.out.println("Member removed");
	break;		break;
	case "add-permission":		case "add-permission":
	if (args.length < 4) {		if (args.length < 4) {
	displayUsage();		displayUsage();
	}		}
	client.addPermission(getNames(args, args.length - 3), args[args.length - 2], args[args.length - 1]);		client.addPermission(getNames(args, 1, args.length - 3), args[args.length - 2], args[args.length - 1]);
	System.out.println("Permission added");		System.out.println("Permission added");
	break;		break;
	case "delete-permission":		case "delete-permission":
	if (args.length < 4) {		if (args.length < 4) {
	displayUsage();		displayUsage();
	}		}
	client.removePermission(getNames(args, args.length - 2), args[args.length - 1]);		client.removePermission(getNames(args, 1, args.length - 2), args[args.length - 1]);
	System.out.println("Permission removed");		System.out.println("Permission removed");
	break;		break;
	case "prepare-join":		case "prepare-join":
	@@ -108,12 +108,12 @@ public class CLI implements CommandLineRunner {

	private void displayUsage() {		private void displayUsage() {
	System.out.println("java -jar gms-client.jar\n"		System.out.println("java -jar gms-client.jar\n"
	+ " add-group <name1 name2 name3>\n"		+ " create-group <name1 name2 name3>\n"
	+ " remove-group <name1 name2 name3>\n"		+ " delete-group <name1 name2 name3>\n"
	+ " add-member <name1 name2 name3> <user_id>\n"		+ " add-member <name1 name2 name3> <user_id>\n"
	+ " remove-member <name1 name2 name3> <user_id>\n"		+ " remove-member <name1 name2 name3> <user_id>\n"
	+ " add-permission <name1 name2 name3> <user_id> <permission>\n"		+ " add-permission <name1 name2 name3> <user_id> <permission>\n"
	+ " remove-permission <name1 name2 name3> <user_id>\n"		+ " delete-permission <name1 name2 name3> <user_id>\n"
	+ " prepare-join <from_user_id> <to_user_id>");		+ " prepare-join <from_user_id> <to_user_id>");
	System.exit(0);		System.exit(0);
	}		}

gms-client/gms-client-lib/src/main/java/it/inaf/ia2/gms/client/GmsClient.java

+13 −9

Original line number	Original line	Diff line number	Diff line
	@@ -16,13 +16,17 @@ import org.springframework.web.util.UriComponentsBuilder;

	public class GmsClient {		public class GmsClient {

	private static final String WS = "ws";

	private final String baseUrl;		private final String baseUrl;
	private final String authHeader;		private final String authHeader;
	private RestTemplate restTemplate;		private RestTemplate restTemplate;

	public GmsClient(String baseUrl, String clientId, String clientSecret) {		public GmsClient(String baseUrl, String clientId, String clientSecret) {

			if (!baseUrl.endsWith("/")) {
			baseUrl += "/";
			}
			baseUrl += "ws/basic";

	this.baseUrl = baseUrl;		this.baseUrl = baseUrl;

	String auth = clientId + ":" + clientSecret;		String auth = clientId + ":" + clientSecret;
	@@ -43,7 +47,7 @@ public class GmsClient {
	public Group addGroup(List<String> names) {		public Group addGroup(List<String> names) {

	String url = UriComponentsBuilder.fromHttpUrl(baseUrl)		String url = UriComponentsBuilder.fromHttpUrl(baseUrl)
	.pathSegment(WS, "group")		.pathSegment("group")
	.toUriString();		.toUriString();

	HttpEntity<List<String>> httpEntity = getEntity(names);		HttpEntity<List<String>> httpEntity = getEntity(names);
	@@ -54,7 +58,7 @@ public class GmsClient {
	public void removeGroup(List<String> names) {		public void removeGroup(List<String> names) {

	String url = UriComponentsBuilder.fromHttpUrl(baseUrl)		String url = UriComponentsBuilder.fromHttpUrl(baseUrl)
	.pathSegment(WS, "group")		.pathSegment("group")
	.queryParam("names", names.toArray())		.queryParam("names", names.toArray())
	.toUriString();		.toUriString();

	@@ -64,7 +68,7 @@ public class GmsClient {
	public Member addMember(List<String> names, String userId) {		public Member addMember(List<String> names, String userId) {

	String url = UriComponentsBuilder.fromHttpUrl(baseUrl)		String url = UriComponentsBuilder.fromHttpUrl(baseUrl)
	.pathSegment(WS, "member")		.pathSegment("member")
	.toUriString();		.toUriString();

	Map<String, Object> params = new HashMap<>();		Map<String, Object> params = new HashMap<>();
	@@ -78,7 +82,7 @@ public class GmsClient {
	public void removeMember(List<String> names, String userId) {		public void removeMember(List<String> names, String userId) {

	String url = UriComponentsBuilder.fromHttpUrl(baseUrl)		String url = UriComponentsBuilder.fromHttpUrl(baseUrl)
	.pathSegment(WS, "member")		.pathSegment("member")
	.queryParam("names", names.toArray())		.queryParam("names", names.toArray())
	.queryParam("userId", userId)		.queryParam("userId", userId)
	.toUriString();		.toUriString();
	@@ -89,7 +93,7 @@ public class GmsClient {
	public Permission addPermission(List<String> names, String userId, String permission) {		public Permission addPermission(List<String> names, String userId, String permission) {

	String url = UriComponentsBuilder.fromHttpUrl(baseUrl)		String url = UriComponentsBuilder.fromHttpUrl(baseUrl)
	.pathSegment(WS, "permission")		.pathSegment("permission")
	.toUriString();		.toUriString();

	Map<String, Object> params = new HashMap<>();		Map<String, Object> params = new HashMap<>();
	@@ -104,7 +108,7 @@ public class GmsClient {
	public void removePermission(List<String> names, String userId) {		public void removePermission(List<String> names, String userId) {

	String url = UriComponentsBuilder.fromHttpUrl(baseUrl)		String url = UriComponentsBuilder.fromHttpUrl(baseUrl)
	.pathSegment(WS, "permission")		.pathSegment("permission")
	.queryParam("names", names.toArray())		.queryParam("names", names.toArray())
	.queryParam("userId", userId)		.queryParam("userId", userId)
	.toUriString();		.toUriString();
	@@ -115,7 +119,7 @@ public class GmsClient {
	public void prepareToJoin(String fromUserId, String toUserId) {		public void prepareToJoin(String fromUserId, String toUserId) {

	String url = UriComponentsBuilder.fromHttpUrl(baseUrl)		String url = UriComponentsBuilder.fromHttpUrl(baseUrl)
	.pathSegment(WS, "prepare-join")		.pathSegment("prepare-join")
	.toUriString();		.toUriString();

	Map<String, Object> params = new HashMap<>();		Map<String, Object> params = new HashMap<>();