Skip to content

Commit c14f6bb

Browse files
authored
Merge pull request #5 from permitio/oded/per-4999-fix-java-sdk
change attrs from string to object
2 parents 080e5a8 + 9dd82c7 commit c14f6bb

13 files changed

Lines changed: 29 additions & 27 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ plugins {
2727
// be published
2828
group = 'io.permit'
2929
// sets the java package version automatically (looks at the git repo, latest tags, commit hashes, etc)
30-
version gitVersion()
30+
version '1.1.0'
3131

3232
repositories {
3333
// Use Maven Central for resolving dependencies.

src/main/java/io/permit/sdk/api/models/ActionModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class ActionModel {
88
public String title = null;
99
public String description = null;
1010
public String path = null;
11-
public HashMap<String, String> attributes = null;
11+
public HashMap<String, Object> attributes = null;
1212
public String permissionName = null;
1313
public Boolean isBuiltIn = null;
1414
}

src/main/java/io/permit/sdk/api/models/ActionSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class ActionSpec {
66
public String title = null;
77
public String description = null;
88
public String path = null;
9-
public HashMap<String, String> attributes = null;
9+
public HashMap<String, Object> attributes = null;
1010
}
1111

1212
//export interface ResourceType {

src/main/java/io/permit/sdk/api/models/NewTenant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ public class NewTenant {
66
public String externalId = null;
77
public String name = null;
88
public String description = null;
9-
public HashMap<String, String> settings = null;
9+
public HashMap<String, Object> settings = null;
1010
}

src/main/java/io/permit/sdk/api/models/ResourceModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ResourceModel {
99
public String name = null;
1010
public String path = null;
1111
public String description = null;
12-
public HashMap<String, String> attributes = null;
12+
public HashMap<String, Object> attributes = null;
1313
public Boolean isBuiltIn = null;
1414
public ArrayList<ActionModel> actions = null;
1515
}

src/main/java/io/permit/sdk/api/models/ResourceSpec.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
public class ResourceSpec {
66
private String type;
77
private String description;
8-
private HashMap<String, String> attributes;
8+
private HashMap<String, Object> attributes;
99
private HashMap<String, ActionSpec> actions = new HashMap<>();
1010

11-
public ResourceSpec(String type, String description, HashMap<String, String> attributes, HashMap<String, ActionSpec> actions) {
11+
public ResourceSpec(String type, String description, HashMap<String, Object> attributes, HashMap<String, ActionSpec> actions) {
1212
this.type = type;
1313
this.description = description;
1414
this.attributes = attributes;
1515
this.actions = actions;
1616
}
1717

18-
public ResourceSpec(String type, String description, HashMap<String, String> attributes) {
18+
public ResourceSpec(String type, String description, HashMap<String, Object> attributes) {
1919
this(type, description, attributes, new HashMap<>());
2020
}
2121

src/main/java/io/permit/sdk/api/models/RoleModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ public class RoleModel {
77
public String id = null;
88
public String name = null;
99
public String description = null;
10-
public HashMap<String, String> attributes = null;
11-
public HashMap<String, String> settings = null;
10+
public HashMap<String, Object> attributes = null;
11+
public HashMap<String, Object> settings = null;
1212
public Boolean isBuiltIn = null;
1313
public ArrayList<PermissionModel> permissions = null;
1414
}

src/main/java/io/permit/sdk/api/models/TenantModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ public class TenantModel {
88
public String externalId = null;
99
public String name = null;
1010
public String description = null;
11-
public HashMap<String, String> settings = null;
11+
public HashMap<String, Object> settings = null;
1212
public String organizationId = null;
1313
}

src/main/java/io/permit/sdk/api/models/UserModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class UserModel {
99
public String firstName = null;
1010
public String lastName = null;
1111
public String email = null;
12-
public HashMap<String, String> attributes = null;
12+
public HashMap<String, Object> attributes = null;
1313
public String organizationId = null;
1414
public ArrayList<String> tenantIds = null;
1515
}

src/main/java/io/permit/sdk/enforcement/Enforcer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class EnforcerInput {
2222
public final User user;
2323
public final String action;
2424
public final Resource resource;
25-
public final HashMap<String, String> context;
25+
public final HashMap<String, Object> context;
2626

27-
EnforcerInput(User user, String action, Resource resource, HashMap<String, String> context) {
27+
EnforcerInput(User user, String action, Resource resource, HashMap<String, Object> context) {
2828
this.user = user;
2929
this.action = action;
3030
this.resource = resource;

0 commit comments

Comments
 (0)