LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ccm-cms/src/main/java/org/librecms/assets/Organization.java
View File

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

31
ccm-cms/src/main/java/org/librecms/assets/Person.java
View File

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

30
ccm-cms/src/main/java/org/librecms/assets/PersonName.java
View File

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