Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dariah
dariahsp
Commits
dbc0b398
Commit
dbc0b398
authored
Dec 13, 2020
by
Gradl, Tobias
Browse files
Merge branch 'v2.1-dev' into 'v2.x-master'
V2.1 dev See merge request
!8
parents
5a1294c2
e29c9a88
Pipeline
#18827
passed with stages
in 2 minutes and 28 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
build.gradle
View file @
dbc0b398
...
...
@@ -5,7 +5,7 @@ plugins {
allprojects
{
group
=
'eu.dariah.de'
version
=
'2.1.
3
-SNAPSHOT'
version
=
'2.1.
4
-SNAPSHOT'
apply
plugin:
'eclipse'
...
...
dariahsp-core/src/main/java/eu/dariah/de/dariahsp/model/ExtendedUserProfile.java
View file @
dbc0b398
...
...
@@ -48,7 +48,7 @@ public class ExtendedUserProfile extends CommonProfile {
*
* @param pojo T
*/
public
<
T
extends
User
Pojo
>
void
fillUser
Pojo
(
T
pojo
)
{
public
<
T
extends
User
>
void
fillUser
(
T
pojo
)
{
if
(
pojo
==
null
)
{
return
;
}
...
...
@@ -59,9 +59,9 @@ public class ExtendedUserProfile extends CommonProfile {
pojo
.
setExpired
(
this
.
isExpired
());
}
public
User
Pojo
toUser
Pojo
()
{
User
Pojo
u
=
new
User
Pojo
();
this
.
fillUser
Pojo
(
u
);
public
User
toUser
()
{
User
u
=
new
User
();
this
.
fillUser
(
u
);
return
u
;
}
}
\ No newline at end of file
dariahsp-core/src/main/java/eu/dariah/de/dariahsp/model/User
Pojo
.java
→
dariahsp-core/src/main/java/eu/dariah/de/dariahsp/model/User.java
View file @
dbc0b398
...
...
@@ -9,11 +9,10 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
User
Pojo
extends
BaseIdentifiable
{
public
class
User
extends
BaseIdentifiable
{
private
static
final
long
serialVersionUID
=
-
3955895740048975623L
;
private
Collection
<
String
>
authorities
;
private
String
id
;
private
String
issuer
;
private
String
username
;
private
boolean
expired
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment