Fixed issues in toString implementations of some entities

deploy_packages_to_gitea
Jens Pelzetter 2023-01-28 11:50:45 +01:00
parent 2b69afa469
commit 13cead79e9
3 changed files with 43 additions and 31 deletions

View File

@ -18,7 +18,6 @@
*/
package org.librecms.assets;
import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import org.hibernate.envers.Audited;
@ -111,11 +110,13 @@ public class Organization extends ContactableEntity {
@Override
public String toString(final String data) {
return super.toString(String.format(
"name = \"%s\"%s",
return super.toString(
String.format(
", name = \"%s\"%s",
name,
data));
data
)
);
}
}

View File

@ -201,9 +201,10 @@ public class Person extends ContactableEntity {
@Override
public String toString(final String data) {
return super.toString(String.format(
return super.toString(
String.format(
// "surname = \"%s\", +"
"personNames = \"%s\", "
", personNames = \"%s\", "
// + "givenName = \"%s\", "
// + "prefix = \"%s\", "
// + "suffix = \"%s\", "
@ -214,7 +215,9 @@ public class Person extends ContactableEntity {
// prefix,
// suffix,
Objects.toString(birthdate),
data));
data
)
);
}
}

View File

@ -134,9 +134,15 @@ public class PersonName implements Serializable {
return obj instanceof PersonName;
}
@Override
public final String toString() {
return toString("");
}
public String toString(final String data) {
return String.format("%s{ "
return String.format(
"%s{ "
+ "surname = \"%s\", "
+ "givenName = \"%s\", "
+ "prefix = \"%s\", "
@ -146,7 +152,9 @@ public class PersonName implements Serializable {
surname,
givenName,
prefix,
suffix);
suffix,
data
);
}
}