GitLab

at 2017-12-10T13:07:54+01:00

fix bean field name

 

     private String password;

 

-    protected LinkedHashSet<ObserveWebUserPermissionBean> roles;

+    protected LinkedHashSet<ObserveWebUserPermissionBean> permissions;

 

     @Override

     public String getLogin() {

 

     @Override

     public LinkedHashSet<ObserveWebUserPermissionBean> getPermissions() {

-        return roles;

+        return permissions;

     }

 

     @Override

     }

 

     public void setPermissions(LinkedHashSet<ObserveWebUserPermissionBean> roles) {

-        this.roles = roles;

+        this.permissions = roles;

     }

 

     public ObserveWebUserImmutable toImmutable() {

-        return new ObserveWebUserImmutable(login, password, Iterables.transform(roles, ObserveWebUserPermissionBean::toImmutable));

+        return new ObserveWebUserImmutable(login, password, Iterables.transform(permissions, ObserveWebUserPermissionBean::toImmutable));

     }

 

 }

...	...	@@ -38,7 +38,7 @@ public class ObserveWebUserBean implements ObserveWebUser<ObserveWebUserPermissi
38	38
39	39	private String password;
40	40
41		- protected LinkedHashSet<ObserveWebUserPermissionBean> roles;
	41	+ protected LinkedHashSet<ObserveWebUserPermissionBean> permissions;
42	42
43	43	@Override
44	44	public String getLogin() {
...	...	@@ -52,7 +52,7 @@ public class ObserveWebUserBean implements ObserveWebUser<ObserveWebUserPermissi
52	52
53	53	@Override
54	54	public LinkedHashSet<ObserveWebUserPermissionBean> getPermissions() {
55		- return roles;
	55	+ return permissions;
56	56	}
57	57
58	58	@Override
...	...	@@ -69,11 +69,11 @@ public class ObserveWebUserBean implements ObserveWebUser<ObserveWebUserPermissi
69	69	}
70	70
71	71	public void setPermissions(LinkedHashSet<ObserveWebUserPermissionBean> roles) {
72		- this.roles = roles;
	72	+ this.permissions = roles;
73	73	}
74	74
75	75	public ObserveWebUserImmutable toImmutable() {
76		- return new ObserveWebUserImmutable(login, password, Iterables.transform(roles, ObserveWebUserPermissionBean::toImmutable));
	76	+ return new ObserveWebUserImmutable(login, password, Iterables.transform(permissions, ObserveWebUserPermissionBean::toImmutable));
77	77	}
78	78
79	79	}

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

1 changed file:

Changes: