Skip to content

Commit ca9fd3f

Browse files
zlamalpzlamalp
committed
Release 3.1.5
- Added attribute searcher for Facilities. - Allow to get Facility attributes by their names. - Added getUserExtSourceByExtLoginAndExtSourceName() to RPC API. - Synchronize only direct members of a group. Previously synchronization might have fail on removing indirect members of a group if group was a part of hierarchical group structure. - Fixed equals() on User and Member objects. - Added module for group:virt:voShortName attribute. - Added modules for VŠUP atttributes.
2 parents 8267e8e + 92edae8 commit ca9fd3f

File tree

58 files changed

+1656
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1656
-257
lines changed

‎perun-auditer-exporter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.4</version>
9+
<version>3.1.5</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

‎perun-auditparser/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.4</version>
9+
<version>3.1.5</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

‎perun-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.4</version>
9+
<version>3.1.5</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

‎perun-base/src/main/java/cz/metacentrum/perun/core/api/Candidate.java‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -91,46 +91,6 @@ public List<UserExtSource> getUserExtSources() {
9191
return Collections.unmodifiableList(userExtSources);
9292
}
9393

94-
@Override
95-
public int hashCode() {
96-
final int prime = 31;
97-
int result = 1;
98-
result = prime * result
99-
+ ((attributes == null) ? 0 : attributes.hashCode());
100-
result = prime * result
101-
+ ((userExtSource == null) ? 0 : userExtSource.hashCode());
102-
return result;
103-
}
104-
105-
@Override
106-
public boolean equals(Object obj) {
107-
if (this == obj) {
108-
return true;
109-
}
110-
if (obj == null) {
111-
return false;
112-
}
113-
if (getClass() != obj.getClass()) {
114-
return false;
115-
}
116-
Candidate other = (Candidate) obj;
117-
if (attributes == null) {
118-
if (other.attributes != null) {
119-
return false;
120-
}
121-
} else if (!attributes.equals(other.attributes)) {
122-
return false;
123-
}
124-
if (userExtSource == null) {
125-
if (other.userExtSource != null) {
126-
return false;
127-
}
128-
} else if (!userExtSource.equals(other.userExtSource)) {
129-
return false;
130-
}
131-
return true;
132-
}
133-
13494
@Override
13595
public String serializeToString() {
13696
StringBuilder str = new StringBuilder();

‎perun-base/src/main/java/cz/metacentrum/perun/core/api/Member.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public boolean equals(Object obj) {
131131
if (obj == null) {
132132
return false;
133133
}
134-
if (!getClass().equals(obj.getClass())) {
134+
if (!(obj instanceof Member)) {
135135
return false;
136136
}
137137
Member other = (Member) obj;

‎perun-base/src/main/java/cz/metacentrum/perun/core/api/RichMember.java‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -68,63 +68,6 @@ public void setUser(User user) {
6868
this.user = user;
6969
}
7070

71-
@Override
72-
public int hashCode() {
73-
final int prime = 31;
74-
int result = 1;
75-
result = prime * result
76-
+ ((memberAttributes == null) ? 0 : memberAttributes.hashCode());
77-
result = prime * result + ((user == null) ? 0 : user.hashCode());
78-
result = prime * result
79-
+ ((userAttributes == null) ? 0 : userAttributes.hashCode());
80-
result = prime * result
81-
+ ((userExtSources == null) ? 0 : userExtSources.hashCode());
82-
return result;
83-
}
84-
85-
@Override
86-
public boolean equals(Object obj) {
87-
if (this == obj) {
88-
return true;
89-
}
90-
if (obj == null) {
91-
return false;
92-
}
93-
if (getClass() != obj.getClass()) {
94-
return false;
95-
}
96-
RichMember other = (RichMember) obj;
97-
if (memberAttributes == null) {
98-
if (other.memberAttributes != null) {
99-
return false;
100-
}
101-
} else if (!memberAttributes.equals(other.memberAttributes)) {
102-
return false;
103-
}
104-
if (user == null) {
105-
if (other.user != null) {
106-
return false;
107-
}
108-
} else if (!user.equals(other.user)) {
109-
return false;
110-
}
111-
if (userAttributes == null) {
112-
if (other.userAttributes != null) {
113-
return false;
114-
}
115-
} else if (!userAttributes.equals(other.userAttributes)) {
116-
return false;
117-
}
118-
if (userExtSources == null) {
119-
if (other.userExtSources != null) {
120-
return false;
121-
}
122-
} else if (!userExtSources.equals(other.userExtSources)) {
123-
return false;
124-
}
125-
return true;
126-
}
127-
12871
@Override
12972
public String serializeToString() {
13073
StringBuilder str = new StringBuilder();

‎perun-base/src/main/java/cz/metacentrum/perun/core/api/RichUser.java‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -47,47 +47,6 @@ public void setUserExtSources(List<UserExtSource> userExtSources) {
4747
this.userExtSources = userExtSources;
4848
}
4949

50-
@Override
51-
public int hashCode() {
52-
final int prime = 31;
53-
int result = 1;
54-
result = prime * result
55-
+ ((userAttributes == null) ? 0 : userAttributes.hashCode());
56-
result = prime * result
57-
+ ((userExtSources == null) ? 0 : userExtSources.hashCode());
58-
return result;
59-
}
60-
61-
@Override
62-
public boolean equals(Object obj) {
63-
if (this == obj) {
64-
return true;
65-
}
66-
if (obj == null) {
67-
return false;
68-
}
69-
if (getClass() != obj.getClass()) {
70-
return false;
71-
}
72-
RichUser other = (RichUser) obj;
73-
if (getId() != other.getId()) return false;
74-
if (userAttributes == null) {
75-
if (other.userAttributes != null) {
76-
return false;
77-
}
78-
} else if (!userAttributes.equals(other.userAttributes)) {
79-
return false;
80-
}
81-
if (userExtSources == null) {
82-
if (other.userExtSources != null) {
83-
return false;
84-
}
85-
} else if (!userExtSources.equals(other.userExtSources)) {
86-
return false;
87-
}
88-
return true;
89-
}
90-
9150
@Override
9251
public String serializeToString() {
9352
StringBuilder str = new StringBuilder();

‎perun-base/src/main/java/cz/metacentrum/perun/core/api/User.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public boolean equals(Object obj) {
255255
return true;
256256
if (obj == null)
257257
return false;
258-
if (getClass() != obj.getClass())
258+
if (!(obj instanceof User))
259259
return false;
260260
User other = (User) obj;
261261
if (firstName == null) {

‎perun-cabinet/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.4</version>
9+
<version>3.1.5</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

‎perun-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.4</version>
9+
<version>3.1.5</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

0 commit comments

Comments
 (0)