diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountBrief.java b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountBrief.java index 57af9d861c3938..79a49651561c08 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountBrief.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountBrief.java @@ -88,7 +88,7 @@ public void setExternalReferenceCode( } @GraphQLField(description = "The account's external reference code.") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected String externalReferenceCode; @JsonIgnore @@ -166,7 +166,7 @@ public void setName(UnsafeSupplier nameUnsafeSupplier) { } @GraphQLField(description = "The account's name.") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected String name; @JsonIgnore @@ -214,6 +214,45 @@ public void setRoleBriefs( @JsonIgnore private Supplier _roleBriefsSupplier; + @Schema(description = "The account's type.") + public String getType() { + if (_typeSupplier != null) { + type = _typeSupplier.get(); + + _typeSupplier = null; + } + + return type; + } + + public void setType(String type) { + this.type = type; + + _typeSupplier = null; + } + + @JsonIgnore + public void setType(UnsafeSupplier typeUnsafeSupplier) { + _typeSupplier = () -> { + try { + return typeUnsafeSupplier.get(); + } + catch (RuntimeException runtimeException) { + throw runtimeException; + } + catch (Exception exception) { + throw new RuntimeException(exception); + } + }; + } + + @GraphQLField(description = "The account's type.") + @JsonProperty(access = JsonProperty.Access.READ_WRITE) + protected String type; + + @JsonIgnore + private Supplier _typeSupplier; + @Override public boolean equals(Object object) { if (this == object) { @@ -307,6 +346,22 @@ public String toString() { sb.append("]"); } + String type = getType(); + + if (type != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"type\": "); + + sb.append("\""); + + sb.append(_escape(type)); + + sb.append("\""); + } + sb.append("}"); return sb.toString(); diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountGroup.java b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountGroup.java index c5372f4ff296d1..edbd04e3aab56f 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountGroup.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/AccountGroup.java @@ -95,7 +95,7 @@ public void setAccountBriefs( @GraphQLField( description = "The list of accounts associated with this account group." ) - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected AccountBrief[] accountBriefs; @JsonIgnore @@ -184,7 +184,7 @@ public void setCreator( } @GraphQLField(description = "The user who created the account group.") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected Creator creator; @JsonIgnore diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/Creator.java b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/Creator.java index 7a7a941e7d9162..4b81c23fd85967 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/Creator.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/Creator.java @@ -137,6 +137,88 @@ public void setContentType( @JsonIgnore private Supplier _contentTypeSupplier; + @Schema(description = "The user's email address.") + public String getEmailAddress() { + if (_emailAddressSupplier != null) { + emailAddress = _emailAddressSupplier.get(); + + _emailAddressSupplier = null; + } + + return emailAddress; + } + + public void setEmailAddress(String emailAddress) { + this.emailAddress = emailAddress; + + _emailAddressSupplier = null; + } + + @JsonIgnore + public void setEmailAddress( + UnsafeSupplier emailAddressUnsafeSupplier) { + + _emailAddressSupplier = () -> { + try { + return emailAddressUnsafeSupplier.get(); + } + catch (RuntimeException runtimeException) { + throw runtimeException; + } + catch (Exception exception) { + throw new RuntimeException(exception); + } + }; + } + + @GraphQLField(description = "The user's email address.") + @JsonProperty(access = JsonProperty.Access.READ_WRITE) + protected String emailAddress; + + @JsonIgnore + private Supplier _emailAddressSupplier; + + @Schema(description = "The user's external reference code.") + public String getExternalReferenceCode() { + if (_externalReferenceCodeSupplier != null) { + externalReferenceCode = _externalReferenceCodeSupplier.get(); + + _externalReferenceCodeSupplier = null; + } + + return externalReferenceCode; + } + + public void setExternalReferenceCode(String externalReferenceCode) { + this.externalReferenceCode = externalReferenceCode; + + _externalReferenceCodeSupplier = null; + } + + @JsonIgnore + public void setExternalReferenceCode( + UnsafeSupplier externalReferenceCodeUnsafeSupplier) { + + _externalReferenceCodeSupplier = () -> { + try { + return externalReferenceCodeUnsafeSupplier.get(); + } + catch (RuntimeException runtimeException) { + throw runtimeException; + } + catch (Exception exception) { + throw new RuntimeException(exception); + } + }; + } + + @GraphQLField(description = "The user's external reference code.") + @JsonProperty(access = JsonProperty.Access.READ_WRITE) + protected String externalReferenceCode; + + @JsonIgnore + private Supplier _externalReferenceCodeSupplier; + @Schema(description = "The user's surname (last name).") public String getFamilyName() { if (_familyNameSupplier != null) { @@ -172,7 +254,7 @@ public void setFamilyName( } @GraphQLField(description = "The user's surname (last name).") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected String familyName; @JsonIgnore @@ -213,7 +295,7 @@ public void setGivenName( } @GraphQLField(description = "The user's first name.") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected String givenName; @JsonIgnore @@ -379,6 +461,47 @@ public void setProfileURL( @JsonIgnore private Supplier _profileURLSupplier; + @Schema(description = "The user's screen name.") + public String getScreenName() { + if (_screenNameSupplier != null) { + screenName = _screenNameSupplier.get(); + + _screenNameSupplier = null; + } + + return screenName; + } + + public void setScreenName(String screenName) { + this.screenName = screenName; + + _screenNameSupplier = null; + } + + @JsonIgnore + public void setScreenName( + UnsafeSupplier screenNameUnsafeSupplier) { + + _screenNameSupplier = () -> { + try { + return screenNameUnsafeSupplier.get(); + } + catch (RuntimeException runtimeException) { + throw runtimeException; + } + catch (Exception exception) { + throw new RuntimeException(exception); + } + }; + } + + @GraphQLField(description = "The user's screen name.") + @JsonProperty(access = JsonProperty.Access.READ_WRITE) + protected String screenName; + + @JsonIgnore + private Supplier _screenNameSupplier; + @Override public boolean equals(Object object) { if (this == object) { @@ -438,6 +561,38 @@ public String toString() { sb.append("\""); } + String emailAddress = getEmailAddress(); + + if (emailAddress != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"emailAddress\": "); + + sb.append("\""); + + sb.append(_escape(emailAddress)); + + sb.append("\""); + } + + String externalReferenceCode = getExternalReferenceCode(); + + if (externalReferenceCode != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"externalReferenceCode\": "); + + sb.append("\""); + + sb.append(_escape(externalReferenceCode)); + + sb.append("\""); + } + String familyName = getFamilyName(); if (familyName != null) { @@ -530,6 +685,22 @@ public String toString() { sb.append("\""); } + String screenName = getScreenName(); + + if (screenName != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"screenName\": "); + + sb.append("\""); + + sb.append(_escape(screenName)); + + sb.append("\""); + } + sb.append("}"); return sb.toString(); diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/RoleBrief.java b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/RoleBrief.java index a17d3ddfd7b03c..8670f62112fda2 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/RoleBrief.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/RoleBrief.java @@ -91,7 +91,7 @@ public void setExternalReferenceCode( } @GraphQLField(description = "The role's external reference code.") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected String externalReferenceCode; @JsonIgnore @@ -136,6 +136,45 @@ public void setId(UnsafeSupplier idUnsafeSupplier) { @JsonIgnore private Supplier _idSupplier; + @Schema(description = "The role's key.") + public String getKey() { + if (_keySupplier != null) { + key = _keySupplier.get(); + + _keySupplier = null; + } + + return key; + } + + public void setKey(String key) { + this.key = key; + + _keySupplier = null; + } + + @JsonIgnore + public void setKey(UnsafeSupplier keyUnsafeSupplier) { + _keySupplier = () -> { + try { + return keyUnsafeSupplier.get(); + } + catch (RuntimeException runtimeException) { + throw runtimeException; + } + catch (Exception exception) { + throw new RuntimeException(exception); + } + }; + } + + @GraphQLField(description = "The role's key.") + @JsonProperty(access = JsonProperty.Access.READ_WRITE) + protected String key; + + @JsonIgnore + private Supplier _keySupplier; + @Schema(description = "The role's name.") public String getName() { if (_nameSupplier != null) { @@ -253,7 +292,7 @@ public void setRoleType( } @GraphQLField(description = "The role's type.") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonProperty(access = JsonProperty.Access.READ_WRITE) protected Integer roleType; @JsonIgnore @@ -314,6 +353,22 @@ public String toString() { sb.append(id); } + String key = getKey(); + + if (key != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"key\": "); + + sb.append("\""); + + sb.append(_escape(key)); + + sb.append("\""); + } + String name = getName(); if (name != null) { diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/AccountBrief.java b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/AccountBrief.java index 787d5db6c9cff1..0c8347f06cfb29 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/AccountBrief.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/AccountBrief.java @@ -105,6 +105,25 @@ public void setRoleBriefs( protected RoleBrief[] roleBriefs; + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public void setType(UnsafeSupplier typeUnsafeSupplier) { + try { + type = typeUnsafeSupplier.get(); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + protected String type; + @Override public AccountBrief clone() throws CloneNotSupportedException { return (AccountBrief)super.clone(); diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/Creator.java b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/Creator.java index 8730fdc2a3f1b8..7f75da35b458b6 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/Creator.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/Creator.java @@ -67,6 +67,48 @@ public void setContentType( protected String contentType; + public String getEmailAddress() { + return emailAddress; + } + + public void setEmailAddress(String emailAddress) { + this.emailAddress = emailAddress; + } + + public void setEmailAddress( + UnsafeSupplier emailAddressUnsafeSupplier) { + + try { + emailAddress = emailAddressUnsafeSupplier.get(); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + protected String emailAddress; + + public String getExternalReferenceCode() { + return externalReferenceCode; + } + + public void setExternalReferenceCode(String externalReferenceCode) { + this.externalReferenceCode = externalReferenceCode; + } + + public void setExternalReferenceCode( + UnsafeSupplier externalReferenceCodeUnsafeSupplier) { + + try { + externalReferenceCode = externalReferenceCodeUnsafeSupplier.get(); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + protected String externalReferenceCode; + public String getFamilyName() { return familyName; } @@ -189,6 +231,27 @@ public void setProfileURL( protected String profileURL; + public String getScreenName() { + return screenName; + } + + public void setScreenName(String screenName) { + this.screenName = screenName; + } + + public void setScreenName( + UnsafeSupplier screenNameUnsafeSupplier) { + + try { + screenName = screenNameUnsafeSupplier.get(); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + protected String screenName; + @Override public Creator clone() throws CloneNotSupportedException { return (Creator)super.clone(); diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/RoleBrief.java b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/RoleBrief.java index 043357325a686d..6a1c5e42c97b47 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/RoleBrief.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/RoleBrief.java @@ -66,6 +66,25 @@ public void setId(UnsafeSupplier idUnsafeSupplier) { protected Long id; + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public void setKey(UnsafeSupplier keyUnsafeSupplier) { + try { + key = keyUnsafeSupplier.get(); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + protected String key; + public String getName() { return name; } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/AccountBriefSerDes.java b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/AccountBriefSerDes.java index d5c5f82c9a5497..410b2ed2bcd1c0 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/AccountBriefSerDes.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/AccountBriefSerDes.java @@ -105,6 +105,20 @@ public static String toJSON(AccountBrief accountBrief) { sb.append("]"); } + if (accountBrief.getType() != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"type\": "); + + sb.append("\""); + + sb.append(_escape(accountBrief.getType())); + + sb.append("\""); + } + sb.append("}"); return sb.toString(); @@ -154,6 +168,13 @@ public static Map toMap(AccountBrief accountBrief) { map.put("roleBriefs", String.valueOf(accountBrief.getRoleBriefs())); } + if (accountBrief.getType() == null) { + map.put("type", null); + } + else { + map.put("type", String.valueOf(accountBrief.getType())); + } + return map; } @@ -184,6 +205,9 @@ else if (Objects.equals(jsonParserFieldName, "name")) { else if (Objects.equals(jsonParserFieldName, "roleBriefs")) { return false; } + else if (Objects.equals(jsonParserFieldName, "type")) { + return false; + } return false; } @@ -226,6 +250,11 @@ else if (Objects.equals(jsonParserFieldName, "roleBriefs")) { accountBrief.setRoleBriefs(roleBriefsArray); } } + else if (Objects.equals(jsonParserFieldName, "type")) { + if (jsonParserFieldValue != null) { + accountBrief.setType((String)jsonParserFieldValue); + } + } } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/CreatorSerDes.java b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/CreatorSerDes.java index 0ffeeb6fedb50f..a982672cb3734c 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/CreatorSerDes.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/CreatorSerDes.java @@ -72,6 +72,34 @@ public static String toJSON(Creator creator) { sb.append("\""); } + if (creator.getEmailAddress() != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"emailAddress\": "); + + sb.append("\""); + + sb.append(_escape(creator.getEmailAddress())); + + sb.append("\""); + } + + if (creator.getExternalReferenceCode() != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"externalReferenceCode\": "); + + sb.append("\""); + + sb.append(_escape(creator.getExternalReferenceCode())); + + sb.append("\""); + } + if (creator.getFamilyName() != null) { if (sb.length() > 1) { sb.append(", "); @@ -152,6 +180,20 @@ public static String toJSON(Creator creator) { sb.append("\""); } + if (creator.getScreenName() != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"screenName\": "); + + sb.append("\""); + + sb.append(_escape(creator.getScreenName())); + + sb.append("\""); + } + sb.append("}"); return sb.toString(); @@ -185,6 +227,22 @@ public static Map toMap(Creator creator) { map.put("contentType", String.valueOf(creator.getContentType())); } + if (creator.getEmailAddress() == null) { + map.put("emailAddress", null); + } + else { + map.put("emailAddress", String.valueOf(creator.getEmailAddress())); + } + + if (creator.getExternalReferenceCode() == null) { + map.put("externalReferenceCode", null); + } + else { + map.put( + "externalReferenceCode", + String.valueOf(creator.getExternalReferenceCode())); + } + if (creator.getFamilyName() == null) { map.put("familyName", null); } @@ -227,6 +285,13 @@ public static Map toMap(Creator creator) { map.put("profileURL", String.valueOf(creator.getProfileURL())); } + if (creator.getScreenName() == null) { + map.put("screenName", null); + } + else { + map.put("screenName", String.valueOf(creator.getScreenName())); + } + return map; } @@ -250,6 +315,14 @@ protected boolean parseMaps(String jsonParserFieldName) { else if (Objects.equals(jsonParserFieldName, "contentType")) { return false; } + else if (Objects.equals(jsonParserFieldName, "emailAddress")) { + return false; + } + else if (Objects.equals( + jsonParserFieldName, "externalReferenceCode")) { + + return false; + } else if (Objects.equals(jsonParserFieldName, "familyName")) { return false; } @@ -268,6 +341,9 @@ else if (Objects.equals(jsonParserFieldName, "name")) { else if (Objects.equals(jsonParserFieldName, "profileURL")) { return false; } + else if (Objects.equals(jsonParserFieldName, "screenName")) { + return false; + } return false; } @@ -287,6 +363,19 @@ else if (Objects.equals(jsonParserFieldName, "contentType")) { creator.setContentType((String)jsonParserFieldValue); } } + else if (Objects.equals(jsonParserFieldName, "emailAddress")) { + if (jsonParserFieldValue != null) { + creator.setEmailAddress((String)jsonParserFieldValue); + } + } + else if (Objects.equals( + jsonParserFieldName, "externalReferenceCode")) { + + if (jsonParserFieldValue != null) { + creator.setExternalReferenceCode( + (String)jsonParserFieldValue); + } + } else if (Objects.equals(jsonParserFieldName, "familyName")) { if (jsonParserFieldValue != null) { creator.setFamilyName((String)jsonParserFieldValue); @@ -317,6 +406,11 @@ else if (Objects.equals(jsonParserFieldName, "profileURL")) { creator.setProfileURL((String)jsonParserFieldValue); } } + else if (Objects.equals(jsonParserFieldName, "screenName")) { + if (jsonParserFieldValue != null) { + creator.setScreenName((String)jsonParserFieldValue); + } + } } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/RoleBriefSerDes.java b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/RoleBriefSerDes.java index e32f60d32f83d4..ca7b9fcce845b8 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/RoleBriefSerDes.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-client/src/main/java/com/liferay/headless/admin/user/client/serdes/v1_0/RoleBriefSerDes.java @@ -68,6 +68,20 @@ public static String toJSON(RoleBrief roleBrief) { sb.append(roleBrief.getId()); } + if (roleBrief.getKey() != null) { + if (sb.length() > 1) { + sb.append(", "); + } + + sb.append("\"key\": "); + + sb.append("\""); + + sb.append(_escape(roleBrief.getKey())); + + sb.append("\""); + } + if (roleBrief.getName() != null) { if (sb.length() > 1) { sb.append(", "); @@ -136,6 +150,13 @@ public static Map toMap(RoleBrief roleBrief) { map.put("id", String.valueOf(roleBrief.getId())); } + if (roleBrief.getKey() == null) { + map.put("key", null); + } + else { + map.put("key", String.valueOf(roleBrief.getKey())); + } + if (roleBrief.getName() == null) { map.put("name", null); } @@ -180,6 +201,9 @@ protected boolean parseMaps(String jsonParserFieldName) { else if (Objects.equals(jsonParserFieldName, "id")) { return false; } + else if (Objects.equals(jsonParserFieldName, "key")) { + return false; + } else if (Objects.equals(jsonParserFieldName, "name")) { return false; } @@ -209,6 +233,11 @@ else if (Objects.equals(jsonParserFieldName, "id")) { roleBrief.setId(Long.valueOf((String)jsonParserFieldValue)); } } + else if (Objects.equals(jsonParserFieldName, "key")) { + if (jsonParserFieldValue != null) { + roleBrief.setKey((String)jsonParserFieldValue); + } + } else if (Objects.equals(jsonParserFieldName, "name")) { if (jsonParserFieldValue != null) { roleBrief.setName((String)jsonParserFieldValue); diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountGroupResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountGroupResourceImpl.java index bab406c33d2ddd..4851a2dec47971 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountGroupResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountGroupResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.AccountGroup; import com.liferay.headless.admin.user.resource.v1_0.AccountGroupResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -205,7 +206,7 @@ public Response postAccountGroupsPageExportBatch( /** * Invoke this method with the command line: * - * curl -X 'POST' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups' -d $'{"customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' + * curl -X 'POST' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups' -d $'{"accountBriefs": ___, "creator": ___, "customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' */ @io.swagger.v3.oas.annotations.Operation( description = "Creates a new account group" @@ -420,7 +421,7 @@ public AccountGroup getAccountGroupByExternalReferenceCode( /** * Invoke this method with the command line: * - * curl -X 'PATCH' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/by-external-reference-code/{externalReferenceCode}' -d $'{"customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' + * curl -X 'PATCH' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/by-external-reference-code/{externalReferenceCode}' -d $'{"accountBriefs": ___, "creator": ___, "customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' */ @io.swagger.v3.oas.annotations.Operation( description = "Updates the account with information sent in the request body. Only the provided fields are updated." @@ -482,7 +483,7 @@ public AccountGroup patchAccountGroupByExternalReferenceCode( /** * Invoke this method with the command line: * - * curl -X 'PUT' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/by-external-reference-code/{externalReferenceCode}' -d $'{"customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' + * curl -X 'PUT' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/by-external-reference-code/{externalReferenceCode}' -d $'{"accountBriefs": ___, "creator": ___, "customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' */ @io.swagger.v3.oas.annotations.Operation( description = "Replaces the account group with information sent in the request body. Any missing fields are deleted unless they are required." @@ -624,7 +625,7 @@ public AccountGroup getAccountGroup( /** * Invoke this method with the command line: * - * curl -X 'PATCH' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/{accountGroupId}' -d $'{"customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' + * curl -X 'PATCH' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/{accountGroupId}' -d $'{"accountBriefs": ___, "creator": ___, "customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' */ @io.swagger.v3.oas.annotations.Operation( description = "Updates the account group with information sent in the request body. Only the provided fields are updated." @@ -682,7 +683,7 @@ public AccountGroup patchAccountGroup( /** * Invoke this method with the command line: * - * curl -X 'PUT' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/{accountGroupId}' -d $'{"customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' + * curl -X 'PUT' 'http://localhost:8080/o/headless-admin-user/v1.0/account-groups/{accountGroupId}' -d $'{"accountBriefs": ___, "creator": ___, "customFields": ___, "description": ___, "externalReferenceCode": ___, "name": ___, "permissions": ___}' --header 'Content-Type: application/json' -u 'test@liferay.com:test' */ @io.swagger.v3.oas.annotations.Operation( description = "Replaces the account group with information sent in the request body. Any missing fields are deleted unless they are required." @@ -915,71 +916,82 @@ public void create( Map parameters) throws Exception { - UnsafeFunction - accountGroupUnsafeFunction = null; + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + UnsafeFunction + accountGroupUnsafeFunction = null; - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - accountGroupUnsafeFunction = accountGroup -> postAccountGroup( - accountGroup); - } - - if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { - String updateStrategy = (String)parameters.getOrDefault( - "updateStrategy", "UPDATE"); + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); - if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { - accountGroupUnsafeFunction = - accountGroup -> putAccountGroupByExternalReferenceCode( - accountGroup.getExternalReferenceCode(), accountGroup); + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + accountGroupUnsafeFunction = accountGroup -> postAccountGroup( + accountGroup); } - if (StringUtil.equalsIgnoreCase(updateStrategy, "PARTIAL_UPDATE")) { - accountGroupUnsafeFunction = accountGroup -> { - AccountGroup persistedAccountGroup = null; - - try { - AccountGroup getAccountGroup = - getAccountGroupByExternalReferenceCode( - accountGroup.getExternalReferenceCode()); - - persistedAccountGroup = patchAccountGroup( - getAccountGroup.getId() != null ? - getAccountGroup.getId() : - _parseLong( - (String)parameters.get( - "accountGroupId")), - accountGroup); - } - catch (NoSuchModelException noSuchModelException) { - persistedAccountGroup = postAccountGroup(accountGroup); - } + if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { + String updateStrategy = (String)parameters.getOrDefault( + "updateStrategy", "UPDATE"); - return persistedAccountGroup; - }; + if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { + accountGroupUnsafeFunction = + accountGroup -> putAccountGroupByExternalReferenceCode( + accountGroup.getExternalReferenceCode(), + accountGroup); + } + + if (StringUtil.equalsIgnoreCase( + updateStrategy, "PARTIAL_UPDATE")) { + + accountGroupUnsafeFunction = accountGroup -> { + AccountGroup persistedAccountGroup = null; + + try { + AccountGroup getAccountGroup = + getAccountGroupByExternalReferenceCode( + accountGroup.getExternalReferenceCode()); + + persistedAccountGroup = patchAccountGroup( + getAccountGroup.getId() != null ? + getAccountGroup.getId() : + _parseLong( + (String)parameters.get( + "accountGroupId")), + accountGroup); + } + catch (NoSuchModelException noSuchModelException) { + persistedAccountGroup = postAccountGroup( + accountGroup); + } + + return persistedAccountGroup; + }; + } } - } - if (accountGroupUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for AccountGroup"); - } + if (accountGroupUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for AccountGroup"); + } - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept( - accountGroups, accountGroupUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept( - accountGroups, accountGroupUnsafeFunction::apply); - } - else { - for (AccountGroup accountGroup : accountGroups) { - accountGroupUnsafeFunction.apply(accountGroup); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept( + accountGroups, accountGroupUnsafeFunction); } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + accountGroups, accountGroupUnsafeFunction::apply); + } + else { + for (AccountGroup accountGroup : accountGroups) { + accountGroupUnsafeFunction.apply(accountGroup); + } + } + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountResourceImpl.java index c0ca9ca1f0e63a..e9852fe407cc3a 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.Account; import com.liferay.headless.admin.user.resource.v1_0.AccountResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -1625,66 +1626,79 @@ public void create( Collection accounts, Map parameters) throws Exception { - UnsafeFunction accountUnsafeFunction = - null; + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + UnsafeFunction accountUnsafeFunction = + null; - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - accountUnsafeFunction = account -> postAccount(account); - } + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); - if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { - String updateStrategy = (String)parameters.getOrDefault( - "updateStrategy", "UPDATE"); - - if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { - accountUnsafeFunction = - account -> putAccountByExternalReferenceCode( - account.getExternalReferenceCode(), account); + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + accountUnsafeFunction = account -> postAccount(account); } - if (StringUtil.equalsIgnoreCase(updateStrategy, "PARTIAL_UPDATE")) { - accountUnsafeFunction = account -> { - Account persistedAccount = null; - - try { - Account getAccount = getAccountByExternalReferenceCode( - account.getExternalReferenceCode()); - - persistedAccount = patchAccount( - getAccount.getId() != null ? getAccount.getId() : - _parseLong((String)parameters.get("accountId")), - account); - } - catch (NoSuchModelException noSuchModelException) { - persistedAccount = postAccount(account); - } - - return persistedAccount; - }; + if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { + String updateStrategy = (String)parameters.getOrDefault( + "updateStrategy", "UPDATE"); + + if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { + accountUnsafeFunction = + account -> putAccountByExternalReferenceCode( + account.getExternalReferenceCode(), account); + } + + if (StringUtil.equalsIgnoreCase( + updateStrategy, "PARTIAL_UPDATE")) { + + accountUnsafeFunction = account -> { + Account persistedAccount = null; + + try { + Account getAccount = + getAccountByExternalReferenceCode( + account.getExternalReferenceCode()); + + persistedAccount = patchAccount( + getAccount.getId() != null ? + getAccount.getId() : + _parseLong( + (String)parameters.get( + "accountId")), + account); + } + catch (NoSuchModelException noSuchModelException) { + persistedAccount = postAccount(account); + } + + return persistedAccount; + }; + } } - } - if (accountUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for Account"); - } + if (accountUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for Account"); + } - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept( - accounts, accountUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept( - accounts, accountUnsafeFunction::apply); - } - else { - for (Account account : accounts) { - accountUnsafeFunction.apply(account); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept( + accounts, accountUnsafeFunction); } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + accounts, accountUnsafeFunction::apply); + } + else { + for (Account account : accounts) { + accountUnsafeFunction.apply(account); + } + } + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountRoleResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountRoleResourceImpl.java index a134cf2b5561a1..295d06c303b47f 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountRoleResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseAccountRoleResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.AccountRole; import com.liferay.headless.admin.user.resource.v1_0.AccountRoleResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -993,43 +994,50 @@ public void create( Map parameters) throws Exception { - UnsafeFunction - accountRoleUnsafeFunction = null; + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + UnsafeFunction + accountRoleUnsafeFunction = null; + + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); + + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + if (parameters.containsKey("accountId")) { + accountRoleUnsafeFunction = + accountRole -> postAccountAccountRole( + _parseLong((String)parameters.get("accountId")), + accountRole); + } + else { + throw new NotSupportedException( + "One of the following parameters must be specified: [accountId]"); + } + } - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + if (accountRoleUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for AccountRole"); + } - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - if (parameters.containsKey("accountId")) { - accountRoleUnsafeFunction = - accountRole -> postAccountAccountRole( - _parseLong((String)parameters.get("accountId")), - accountRole); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept( + accountRoles, accountRoleUnsafeFunction); + } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + accountRoles, accountRoleUnsafeFunction::apply); } else { - throw new NotSupportedException( - "One of the following parameters must be specified: [accountId]"); + for (AccountRole accountRole : accountRoles) { + accountRoleUnsafeFunction.apply(accountRole); + } } } - - if (accountRoleUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for AccountRole"); - } - - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept( - accountRoles, accountRoleUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept( - accountRoles, accountRoleUnsafeFunction::apply); - } - else { - for (AccountRole accountRole : accountRoles) { - accountRoleUnsafeFunction.apply(accountRole); - } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseEmailAddressResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseEmailAddressResourceImpl.java index c800af0de95a6c..46456650084d01 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseEmailAddressResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseEmailAddressResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.EmailAddress; import com.liferay.headless.admin.user.resource.v1_0.EmailAddressResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -745,8 +746,15 @@ public void create( Map parameters) throws Exception { - throw new UnsupportedOperationException( - "This method needs to be implemented"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + throw new UnsupportedOperationException( + "This method needs to be implemented"); + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); + } } @Override diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseOrganizationResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseOrganizationResourceImpl.java index 79488fcc2f837d..68bcde4e1782c3 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseOrganizationResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseOrganizationResourceImpl.java @@ -8,6 +8,7 @@ import com.liferay.headless.admin.user.dto.v1_0.Organization; import com.liferay.headless.admin.user.dto.v1_0.UserAccount; import com.liferay.headless.admin.user.resource.v1_0.OrganizationResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -1680,69 +1681,81 @@ public void create( Map parameters) throws Exception { - UnsafeFunction - organizationUnsafeFunction = null; + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + UnsafeFunction + organizationUnsafeFunction = null; - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - organizationUnsafeFunction = organization -> postOrganization( - organization); - } - - if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { - String updateStrategy = (String)parameters.getOrDefault( - "updateStrategy", "UPDATE"); + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); - if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { - organizationUnsafeFunction = - organization -> putOrganizationByExternalReferenceCode( - organization.getExternalReferenceCode(), organization); + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + organizationUnsafeFunction = organization -> postOrganization( + organization); } - if (StringUtil.equalsIgnoreCase(updateStrategy, "PARTIAL_UPDATE")) { - organizationUnsafeFunction = organization -> { - Organization persistedOrganization = null; - - try { - Organization getOrganization = - getOrganizationByExternalReferenceCode( - organization.getExternalReferenceCode()); + if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { + String updateStrategy = (String)parameters.getOrDefault( + "updateStrategy", "UPDATE"); - persistedOrganization = patchOrganization( - getOrganization.getId() != null ? - getOrganization.getId() : - (String)parameters.get("organizationId"), + if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { + organizationUnsafeFunction = + organization -> putOrganizationByExternalReferenceCode( + organization.getExternalReferenceCode(), organization); - } - catch (NoSuchModelException noSuchModelException) { - persistedOrganization = postOrganization(organization); - } - - return persistedOrganization; - }; + } + + if (StringUtil.equalsIgnoreCase( + updateStrategy, "PARTIAL_UPDATE")) { + + organizationUnsafeFunction = organization -> { + Organization persistedOrganization = null; + + try { + Organization getOrganization = + getOrganizationByExternalReferenceCode( + organization.getExternalReferenceCode()); + + persistedOrganization = patchOrganization( + getOrganization.getId() != null ? + getOrganization.getId() : + (String)parameters.get( + "organizationId"), + organization); + } + catch (NoSuchModelException noSuchModelException) { + persistedOrganization = postOrganization( + organization); + } + + return persistedOrganization; + }; + } } - } - if (organizationUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for Organization"); - } + if (organizationUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for Organization"); + } - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept( - organizations, organizationUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept( - organizations, organizationUnsafeFunction::apply); - } - else { - for (Organization organization : organizations) { - organizationUnsafeFunction.apply(organization); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept( + organizations, organizationUnsafeFunction); } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + organizations, organizationUnsafeFunction::apply); + } + else { + for (Organization organization : organizations) { + organizationUnsafeFunction.apply(organization); + } + } + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePhoneResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePhoneResourceImpl.java index 8b402c5588c25d..c2378d157794da 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePhoneResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePhoneResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.Phone; import com.liferay.headless.admin.user.resource.v1_0.PhoneResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -734,8 +735,15 @@ public void create( Collection phones, Map parameters) throws Exception { - throw new UnsupportedOperationException( - "This method needs to be implemented"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + throw new UnsupportedOperationException( + "This method needs to be implemented"); + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); + } } @Override diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePostalAddressResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePostalAddressResourceImpl.java index db6a9cfe1c6d54..54edbf22963e74 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePostalAddressResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BasePostalAddressResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.PostalAddress; import com.liferay.headless.admin.user.resource.v1_0.PostalAddressResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -1116,88 +1117,101 @@ public void create( Map parameters) throws Exception { - UnsafeFunction - postalAddressUnsafeFunction = null; + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + UnsafeFunction + postalAddressUnsafeFunction = null; - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - if (parameters.containsKey("accountId")) { - postalAddressUnsafeFunction = - postalAddress -> postAccountPostalAddress( - _parseLong((String)parameters.get("accountId")), - postalAddress); - } - else { - throw new NotSupportedException( - "One of the following parameters must be specified: [accountId]"); + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); + + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + if (parameters.containsKey("accountId")) { + postalAddressUnsafeFunction = + postalAddress -> postAccountPostalAddress( + _parseLong((String)parameters.get("accountId")), + postalAddress); + } + else { + throw new NotSupportedException( + "One of the following parameters must be specified: [accountId]"); + } } - } - if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { - String updateStrategy = (String)parameters.getOrDefault( - "updateStrategy", "UPDATE"); + if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { + String updateStrategy = (String)parameters.getOrDefault( + "updateStrategy", "UPDATE"); - if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { - postalAddressUnsafeFunction = - postalAddress -> putPostalAddressByExternalReferenceCode( - postalAddress.getExternalReferenceCode(), - postalAddress); - } + if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { + postalAddressUnsafeFunction = + postalAddress -> + putPostalAddressByExternalReferenceCode( + postalAddress.getExternalReferenceCode(), + postalAddress); + } - if (StringUtil.equalsIgnoreCase(updateStrategy, "PARTIAL_UPDATE")) { - postalAddressUnsafeFunction = postalAddress -> { - PostalAddress persistedPostalAddress = null; - - try { - PostalAddress getPostalAddress = - getPostalAddressByExternalReferenceCode( - postalAddress.getExternalReferenceCode()); - - persistedPostalAddress = patchPostalAddress( - getPostalAddress.getId() != null ? - getPostalAddress.getId() : - _parseLong( - (String)parameters.get( - "postalAddressId")), - postalAddress); - } - catch (NoSuchModelException noSuchModelException) { - if (parameters.containsKey("accountId")) { - persistedPostalAddress = postAccountPostalAddress( - _parseLong((String)parameters.get("accountId")), + if (StringUtil.equalsIgnoreCase( + updateStrategy, "PARTIAL_UPDATE")) { + + postalAddressUnsafeFunction = postalAddress -> { + PostalAddress persistedPostalAddress = null; + + try { + PostalAddress getPostalAddress = + getPostalAddressByExternalReferenceCode( + postalAddress.getExternalReferenceCode()); + + persistedPostalAddress = patchPostalAddress( + getPostalAddress.getId() != null ? + getPostalAddress.getId() : + _parseLong( + (String)parameters.get( + "postalAddressId")), postalAddress); } - else { - throw new NotSupportedException( - "One of the following parameters must be specified: [accountId]"); + catch (NoSuchModelException noSuchModelException) { + if (parameters.containsKey("accountId")) { + persistedPostalAddress = + postAccountPostalAddress( + _parseLong( + (String)parameters.get( + "accountId")), + postalAddress); + } + else { + throw new NotSupportedException( + "One of the following parameters must be specified: [accountId]"); + } } - } - return persistedPostalAddress; - }; + return persistedPostalAddress; + }; + } } - } - if (postalAddressUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for PostalAddress"); - } + if (postalAddressUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for PostalAddress"); + } - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept( - postalAddresses, postalAddressUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept( - postalAddresses, postalAddressUnsafeFunction::apply); - } - else { - for (PostalAddress postalAddress : postalAddresses) { - postalAddressUnsafeFunction.apply(postalAddress); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept( + postalAddresses, postalAddressUnsafeFunction); } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + postalAddresses, postalAddressUnsafeFunction::apply); + } + else { + for (PostalAddress postalAddress : postalAddresses) { + postalAddressUnsafeFunction.apply(postalAddress); + } + } + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseRoleResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseRoleResourceImpl.java index 714d69cda5c62d..ceb057499bdeab 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseRoleResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseRoleResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.Role; import com.liferay.headless.admin.user.resource.v1_0.RoleResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -1265,62 +1266,73 @@ public void create( Collection roles, Map parameters) throws Exception { - UnsafeFunction roleUnsafeFunction = null; - - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - roleUnsafeFunction = role -> postRole(role); - } + UnsafeFunction roleUnsafeFunction = null; - if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { - String updateStrategy = (String)parameters.getOrDefault( - "updateStrategy", "UPDATE"); + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); - if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { - roleUnsafeFunction = role -> putRoleByExternalReferenceCode( - role.getExternalReferenceCode(), role); + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + roleUnsafeFunction = role -> postRole(role); } - if (StringUtil.equalsIgnoreCase(updateStrategy, "PARTIAL_UPDATE")) { - roleUnsafeFunction = role -> { - Role persistedRole = null; - - try { - Role getRole = getRoleByExternalReferenceCode( - role.getExternalReferenceCode()); - - persistedRole = patchRole( - getRole.getId() != null ? getRole.getId() : - _parseLong((String)parameters.get("roleId")), - role); - } - catch (NoSuchModelException noSuchModelException) { - persistedRole = postRole(role); - } - - return persistedRole; - }; + if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { + String updateStrategy = (String)parameters.getOrDefault( + "updateStrategy", "UPDATE"); + + if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { + roleUnsafeFunction = role -> putRoleByExternalReferenceCode( + role.getExternalReferenceCode(), role); + } + + if (StringUtil.equalsIgnoreCase( + updateStrategy, "PARTIAL_UPDATE")) { + + roleUnsafeFunction = role -> { + Role persistedRole = null; + + try { + Role getRole = getRoleByExternalReferenceCode( + role.getExternalReferenceCode()); + + persistedRole = patchRole( + getRole.getId() != null ? getRole.getId() : + _parseLong( + (String)parameters.get("roleId")), + role); + } + catch (NoSuchModelException noSuchModelException) { + persistedRole = postRole(role); + } + + return persistedRole; + }; + } } - } - if (roleUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for Role"); - } + if (roleUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for Role"); + } - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept(roles, roleUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept(roles, roleUnsafeFunction::apply); - } - else { - for (Role role : roles) { - roleUnsafeFunction.apply(role); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept(roles, roleUnsafeFunction); + } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + roles, roleUnsafeFunction::apply); } + else { + for (Role role : roles) { + roleUnsafeFunction.apply(role); + } + } + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentResourceImpl.java index dccc224027096e..6f89ee8f190adf 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.Segment; import com.liferay.headless.admin.user.resource.v1_0.SegmentResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -226,8 +227,15 @@ public void create( Collection segments, Map parameters) throws Exception { - throw new UnsupportedOperationException( - "This method needs to be implemented"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + throw new UnsupportedOperationException( + "This method needs to be implemented"); + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); + } } @Override diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentUserResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentUserResourceImpl.java index fec0aa243e4ecb..edec2aafbaffa9 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentUserResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSegmentUserResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.SegmentUser; import com.liferay.headless.admin.user.resource.v1_0.SegmentUserResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -116,8 +117,15 @@ public void create( Map parameters) throws Exception { - throw new UnsupportedOperationException( - "This method needs to be implemented"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + throw new UnsupportedOperationException( + "This method needs to be implemented"); + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); + } } @Override diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSiteResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSiteResourceImpl.java index d1103c6781b7c6..7bf928c056ff3c 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSiteResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSiteResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.Site; import com.liferay.headless.admin.user.resource.v1_0.SiteResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -166,8 +167,15 @@ public void create( Collection sites, Map parameters) throws Exception { - throw new UnsupportedOperationException( - "This method needs to be implemented"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + throw new UnsupportedOperationException( + "This method needs to be implemented"); + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); + } } @Override diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSubscriptionResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSubscriptionResourceImpl.java index 4f17fac01c78d4..1aaba859a41402 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSubscriptionResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseSubscriptionResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.Subscription; import com.liferay.headless.admin.user.resource.v1_0.SubscriptionResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -170,8 +171,15 @@ public void create( Map parameters) throws Exception { - throw new UnsupportedOperationException( - "This method needs to be implemented"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + throw new UnsupportedOperationException( + "This method needs to be implemented"); + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); + } } @Override diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserAccountResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserAccountResourceImpl.java index f983affa4bce64..569c8ad15a17c2 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserAccountResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserAccountResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.UserAccount; import com.liferay.headless.admin.user.resource.v1_0.UserAccountResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -2479,85 +2480,97 @@ public void create( Map parameters) throws Exception { - UnsafeFunction - userAccountUnsafeFunction = null; + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + UnsafeFunction + userAccountUnsafeFunction = null; - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - userAccountUnsafeFunction = userAccount -> postUserAccount( - userAccount); + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); + + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + userAccountUnsafeFunction = userAccount -> postUserAccount( + userAccount); - if (parameters.containsKey("accountId")) { - userAccountUnsafeFunction = - userAccount -> postAccountUserAccount( - _parseLong((String)parameters.get("accountId")), - userAccount); + if (parameters.containsKey("accountId")) { + userAccountUnsafeFunction = + userAccount -> postAccountUserAccount( + _parseLong((String)parameters.get("accountId")), + userAccount); + } } - } - if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { - String updateStrategy = (String)parameters.getOrDefault( - "updateStrategy", "UPDATE"); + if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { + String updateStrategy = (String)parameters.getOrDefault( + "updateStrategy", "UPDATE"); - if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { - userAccountUnsafeFunction = - userAccount -> putUserAccountByExternalReferenceCode( - userAccount.getExternalReferenceCode(), userAccount); - } + if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { + userAccountUnsafeFunction = + userAccount -> putUserAccountByExternalReferenceCode( + userAccount.getExternalReferenceCode(), + userAccount); + } - if (StringUtil.equalsIgnoreCase(updateStrategy, "PARTIAL_UPDATE")) { - userAccountUnsafeFunction = userAccount -> { - UserAccount persistedUserAccount = null; + if (StringUtil.equalsIgnoreCase( + updateStrategy, "PARTIAL_UPDATE")) { - try { - UserAccount getUserAccount = - getUserAccountByExternalReferenceCode( - userAccount.getExternalReferenceCode()); + userAccountUnsafeFunction = userAccount -> { + UserAccount persistedUserAccount = null; - persistedUserAccount = patchUserAccount( - getUserAccount.getId() != null ? - getUserAccount.getId() : - _parseLong( - (String)parameters.get( - "userAccountId")), - userAccount); - } - catch (NoSuchModelException noSuchModelException) { - if (parameters.containsKey("accountId")) { - persistedUserAccount = postAccountUserAccount( - _parseLong((String)parameters.get("accountId")), + try { + UserAccount getUserAccount = + getUserAccountByExternalReferenceCode( + userAccount.getExternalReferenceCode()); + + persistedUserAccount = patchUserAccount( + getUserAccount.getId() != null ? + getUserAccount.getId() : + _parseLong( + (String)parameters.get( + "userAccountId")), userAccount); } - else { - persistedUserAccount = postUserAccount(userAccount); + catch (NoSuchModelException noSuchModelException) { + if (parameters.containsKey("accountId")) { + persistedUserAccount = postAccountUserAccount( + _parseLong( + (String)parameters.get("accountId")), + userAccount); + } + else { + persistedUserAccount = postUserAccount( + userAccount); + } } - } - return persistedUserAccount; - }; + return persistedUserAccount; + }; + } } - } - if (userAccountUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for UserAccount"); - } + if (userAccountUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for UserAccount"); + } - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept( - userAccounts, userAccountUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept( - userAccounts, userAccountUnsafeFunction::apply); - } - else { - for (UserAccount userAccount : userAccounts) { - userAccountUnsafeFunction.apply(userAccount); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept( + userAccounts, userAccountUnsafeFunction); + } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + userAccounts, userAccountUnsafeFunction::apply); } + else { + for (UserAccount userAccount : userAccounts) { + userAccountUnsafeFunction.apply(userAccount); + } + } + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserGroupResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserGroupResourceImpl.java index 9c432a687622f7..fbe7b7866726ca 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserGroupResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseUserGroupResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.UserGroup; import com.liferay.headless.admin.user.resource.v1_0.UserGroupResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -807,69 +808,79 @@ public void create( Map parameters) throws Exception { - UnsafeFunction - userGroupUnsafeFunction = null; + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); - String createStrategy = (String)parameters.getOrDefault( - "createStrategy", "INSERT"); + UnsafeFunction + userGroupUnsafeFunction = null; - if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { - userGroupUnsafeFunction = userGroup -> postUserGroup(userGroup); - } + String createStrategy = (String)parameters.getOrDefault( + "createStrategy", "INSERT"); - if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { - String updateStrategy = (String)parameters.getOrDefault( - "updateStrategy", "UPDATE"); - - if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { - userGroupUnsafeFunction = - userGroup -> putUserGroupByExternalReferenceCode( - userGroup.getExternalReferenceCode(), userGroup); + if (StringUtil.equalsIgnoreCase(createStrategy, "INSERT")) { + userGroupUnsafeFunction = userGroup -> postUserGroup(userGroup); } - if (StringUtil.equalsIgnoreCase(updateStrategy, "PARTIAL_UPDATE")) { - userGroupUnsafeFunction = userGroup -> { - UserGroup persistedUserGroup = null; - - try { - UserGroup getUserGroup = - getUserGroupByExternalReferenceCode( - userGroup.getExternalReferenceCode()); - - persistedUserGroup = patchUserGroup( - getUserGroup.getId() != null ? - getUserGroup.getId() : - _parseLong( - (String)parameters.get("userGroupId")), - userGroup); - } - catch (NoSuchModelException noSuchModelException) { - persistedUserGroup = postUserGroup(userGroup); - } - - return persistedUserGroup; - }; + if (StringUtil.equalsIgnoreCase(createStrategy, "UPSERT")) { + String updateStrategy = (String)parameters.getOrDefault( + "updateStrategy", "UPDATE"); + + if (StringUtil.equalsIgnoreCase(updateStrategy, "UPDATE")) { + userGroupUnsafeFunction = + userGroup -> putUserGroupByExternalReferenceCode( + userGroup.getExternalReferenceCode(), userGroup); + } + + if (StringUtil.equalsIgnoreCase( + updateStrategy, "PARTIAL_UPDATE")) { + + userGroupUnsafeFunction = userGroup -> { + UserGroup persistedUserGroup = null; + + try { + UserGroup getUserGroup = + getUserGroupByExternalReferenceCode( + userGroup.getExternalReferenceCode()); + + persistedUserGroup = patchUserGroup( + getUserGroup.getId() != null ? + getUserGroup.getId() : + _parseLong( + (String)parameters.get( + "userGroupId")), + userGroup); + } + catch (NoSuchModelException noSuchModelException) { + persistedUserGroup = postUserGroup(userGroup); + } + + return persistedUserGroup; + }; + } } - } - if (userGroupUnsafeFunction == null) { - throw new NotSupportedException( - "Create strategy \"" + createStrategy + - "\" is not supported for UserGroup"); - } + if (userGroupUnsafeFunction == null) { + throw new NotSupportedException( + "Create strategy \"" + createStrategy + + "\" is not supported for UserGroup"); + } - if (contextBatchUnsafeBiConsumer != null) { - contextBatchUnsafeBiConsumer.accept( - userGroups, userGroupUnsafeFunction); - } - else if (contextBatchUnsafeConsumer != null) { - contextBatchUnsafeConsumer.accept( - userGroups, userGroupUnsafeFunction::apply); - } - else { - for (UserGroup userGroup : userGroups) { - userGroupUnsafeFunction.apply(userGroup); + if (contextBatchUnsafeBiConsumer != null) { + contextBatchUnsafeBiConsumer.accept( + userGroups, userGroupUnsafeFunction); } + else if (contextBatchUnsafeConsumer != null) { + contextBatchUnsafeConsumer.accept( + userGroups, userGroupUnsafeFunction::apply); + } + else { + for (UserGroup userGroup : userGroups) { + userGroupUnsafeFunction.apply(userGroup); + } + } + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); } } diff --git a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseWebUrlResourceImpl.java b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseWebUrlResourceImpl.java index 7e9f9d19999ef2..154c2d10c470b8 100644 --- a/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseWebUrlResourceImpl.java +++ b/modules/apps/headless/headless-admin-user/headless-admin-user-impl/src/main/java/com/liferay/headless/admin/user/internal/resource/v1_0/BaseWebUrlResourceImpl.java @@ -7,6 +7,7 @@ import com.liferay.headless.admin.user.dto.v1_0.WebUrl; import com.liferay.headless.admin.user.resource.v1_0.WebUrlResource; +import com.liferay.lazy.referencing.kernel.LazyReferencingThreadLocal; import com.liferay.petra.function.UnsafeBiConsumer; import com.liferay.petra.function.UnsafeConsumer; import com.liferay.petra.function.UnsafeFunction; @@ -733,8 +734,15 @@ public void create( Collection webUrls, Map parameters) throws Exception { - throw new UnsupportedOperationException( - "This method needs to be implemented"); + try { + LazyReferencingThreadLocal.setLazyReferencingEnabled(true); + + throw new UnsupportedOperationException( + "This method needs to be implemented"); + } + finally { + LazyReferencingThreadLocal.setLazyReferencingEnabled(false); + } } @Override