Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DO-NOT-MERGE] LPS-105228 Move converter to vulcan to allow extensability and start using it in Organization #82465

Closed
wants to merge 10 commits into from
Closed

[DO-NOT-MERGE] LPS-105228 Move converter to vulcan to allow extensability and start using it in Organization #82465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b3b4e9d
LPS-105228 move DTO converter context to Vulcan
javiergamarra Dec 22, 2019
88b0e91
LPS-105228 add a new registry to be potentially used with all the DTO…
javiergamarra Dec 22, 2019
5b22940
LPS-105228 adapt existing DTOs
javiergamarra Dec 22, 2019
16b710f
LPS-105228 change organization id to support external reference code
javiergamarra Dec 22, 2019
67fc0a7
LPS-105228 create new converter for Organisation
javiergamarra Dec 22, 2019
2dfecee
LPS-105228 adapt related resources to use new converter
javiergamarra Dec 22, 2019
b6af8fc
LPS-105228 fix type error with GraphQL tests
javiergamarra Dec 22, 2019
f896e26
LPS-105228 generate
javiergamarra Dec 22, 2019
0a9ae54
LPS-105228 remove registry to avoid circular dependency
javiergamarra Dec 24, 2019
b481028
LPS-105228 regenerate
javiergamarra Dec 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions ...s-admin-user-api/src/main/java/com/liferay/headless/admin/user/dto/v1_0/Organization.java
View file
Open in desktop
Expand Up @@ -172,16 +172,16 @@ public void setDateModified(
protected Date dateModified;

@Schema(description = "The organization's ID.")
public Long getId() {
public String getId() {
return id;
}

public void setId(Long id) {
public void setId(String id) {
this.id = id;
}

@JsonIgnore
public void setId(UnsafeSupplier<Long, Exception> idUnsafeSupplier) {
public void setId(UnsafeSupplier<String, Exception> idUnsafeSupplier) {
try {
id = idUnsafeSupplier.get();
}
Expand All @@ -195,7 +195,7 @@ public void setId(UnsafeSupplier<Long, Exception> idUnsafeSupplier) {

@GraphQLField(description = "The organization's ID.")
@JsonProperty(access = JsonProperty.Access.READ_WRITE)
protected Long id;
protected String id;

@Schema(description = "A relative URL to the organization's image.")
public String getImage() {
Expand Down Expand Up @@ -546,7 +546,11 @@ public String toString() {

sb.append("\"id\": ");

sb.append(id);
sb.append("\"");

sb.append(_escape(id));

sb.append("\"");
}

if (image != null) {
Expand Down
2 changes: 1 addition & 1 deletion ...api/src/main/java/com/liferay/headless/admin/user/resource/v1_0/EmailAddressResource.java
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ public interface EmailAddressResource {
public EmailAddress getEmailAddress(Long emailAddressId) throws Exception;

public Page<EmailAddress> getOrganizationEmailAddressesPage(
Long organizationId)
String organizationId)
throws Exception;

public Page<EmailAddress> getUserAccountEmailAddressesPage(
Expand Down
6 changes: 3 additions & 3 deletions ...api/src/main/java/com/liferay/headless/admin/user/resource/v1_0/OrganizationResource.java
View file
Open in desktop
Expand Up @@ -47,12 +47,12 @@ public Page<Organization> getOrganizationsPage(
Pagination pagination, Sort[] sorts)
throws Exception;

public void deleteOrganization(Long organizationId) throws Exception;
public void deleteOrganization(String organizationId) throws Exception;

public Organization getOrganization(Long organizationId) throws Exception;
public Organization getOrganization(String organizationId) throws Exception;

public Page<Organization> getOrganizationOrganizationsPage(
Long parentOrganizationId, Boolean flatten, String search,
String parentOrganizationId, Boolean flatten, String search,
Filter filter, Pagination pagination, Sort[] sorts)
throws Exception;

Expand Down
2 changes: 1 addition & 1 deletion ...n-user-api/src/main/java/com/liferay/headless/admin/user/resource/v1_0/PhoneResource.java
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
@ProviderType
public interface PhoneResource {

public Page<Phone> getOrganizationPhonesPage(Long organizationId)
public Page<Phone> getOrganizationPhonesPage(String organizationId)
throws Exception;

public Phone getPhone(Long phoneId) throws Exception;
Expand Down
2 changes: 1 addition & 1 deletion ...pi/src/main/java/com/liferay/headless/admin/user/resource/v1_0/PostalAddressResource.java
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@
public interface PostalAddressResource {

public Page<PostalAddress> getOrganizationPostalAddressesPage(
Long organizationId)
String organizationId)
throws Exception;

public PostalAddress getPostalAddress(Long postalAddressId)
Expand Down
2 changes: 1 addition & 1 deletion ...-api/src/main/java/com/liferay/headless/admin/user/resource/v1_0/UserAccountResource.java
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ public interface UserAccountResource {
public UserAccount getMyUserAccount() throws Exception;

public Page<UserAccount> getOrganizationUserAccountsPage(
Long organizationId, String search, Filter filter,
String organizationId, String search, Filter filter,
Pagination pagination, Sort[] sorts)
throws Exception;

Expand Down
2 changes: 1 addition & 1 deletion ...-user-api/src/main/java/com/liferay/headless/admin/user/resource/v1_0/WebUrlResource.java
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
@ProviderType
public interface WebUrlResource {

public Page<WebUrl> getOrganizationWebUrlsPage(Long organizationId)
public Page<WebUrl> getOrganizationWebUrlsPage(String organizationId)
throws Exception;

public Page<WebUrl> getUserAccountWebUrlsPage(Long userAccountId)
Expand Down
2 changes: 1 addition & 1 deletion ...min-user-api/src/main/resources/com/liferay/headless/admin/user/resource/v1_0/packageinfo
View file
Open in desktop
@@ -1 +1 @@
version 3.2.0
version 4.0.0
8 changes: 4 additions & 4 deletions ...er-client/src/main/java/com/liferay/headless/admin/user/client/dto/v1_0/Organization.java
View file
Open in desktop
Expand Up @@ -113,15 +113,15 @@ public void setDateModified(

protected Date dateModified;

public Long getId() {
public String getId() {
return id;
}

public void setId(Long id) {
public void setId(String id) {
this.id = id;
}

public void setId(UnsafeSupplier<Long, Exception> idUnsafeSupplier) {
public void setId(UnsafeSupplier<String, Exception> idUnsafeSupplier) {
try {
id = idUnsafeSupplier.get();
}
Expand All @@ -130,7 +130,7 @@ public void setId(UnsafeSupplier<Long, Exception> idUnsafeSupplier) {
}
}

protected Long id;
protected String id;

public String getImage() {
return image;
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/com/liferay/headless/admin/user/client/resource/v1_0/EmailAddressResource.java
View file
Open in desktop
Expand Up @@ -45,11 +45,11 @@ public HttpInvoker.HttpResponse getEmailAddressHttpResponse(
throws Exception;

public Page<EmailAddress> getOrganizationEmailAddressesPage(
Long organizationId)
String organizationId)
throws Exception;

public HttpInvoker.HttpResponse
getOrganizationEmailAddressesPageHttpResponse(Long organizationId)
getOrganizationEmailAddressesPageHttpResponse(String organizationId)
throws Exception;

public Page<EmailAddress> getUserAccountEmailAddressesPage(
Expand Down Expand Up @@ -180,7 +180,7 @@ public HttpInvoker.HttpResponse getEmailAddressHttpResponse(
}

public Page<EmailAddress> getOrganizationEmailAddressesPage(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker.HttpResponse httpResponse =
Expand All @@ -199,7 +199,7 @@ public Page<EmailAddress> getOrganizationEmailAddressesPage(

public HttpInvoker.HttpResponse
getOrganizationEmailAddressesPageHttpResponse(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker httpInvoker = HttpInvoker.newHttpInvoker();
Expand Down
24 changes: 12 additions & 12 deletions .../main/java/com/liferay/headless/admin/user/client/resource/v1_0/OrganizationResource.java
View file
Open in desktop
Expand Up @@ -49,26 +49,26 @@ public HttpInvoker.HttpResponse getOrganizationsPageHttpResponse(
Pagination pagination, String sortString)
throws Exception;

public void deleteOrganization(Long organizationId) throws Exception;
public void deleteOrganization(String organizationId) throws Exception;

public HttpInvoker.HttpResponse deleteOrganizationHttpResponse(
Long organizationId)
String organizationId)
throws Exception;

public Organization getOrganization(Long organizationId) throws Exception;
public Organization getOrganization(String organizationId) throws Exception;

public HttpInvoker.HttpResponse getOrganizationHttpResponse(
Long organizationId)
String organizationId)
throws Exception;

public Page<Organization> getOrganizationOrganizationsPage(
Long parentOrganizationId, Boolean flatten, String search,
String parentOrganizationId, Boolean flatten, String search,
String filterString, Pagination pagination, String sortString)
throws Exception;

public HttpInvoker.HttpResponse
getOrganizationOrganizationsPageHttpResponse(
Long parentOrganizationId, Boolean flatten, String search,
String parentOrganizationId, Boolean flatten, String search,
String filterString, Pagination pagination, String sortString)
throws Exception;

Expand Down Expand Up @@ -208,7 +208,7 @@ public HttpInvoker.HttpResponse getOrganizationsPageHttpResponse(
return httpInvoker.invoke();
}

public void deleteOrganization(Long organizationId) throws Exception {
public void deleteOrganization(String organizationId) throws Exception {
HttpInvoker.HttpResponse httpResponse =
deleteOrganizationHttpResponse(organizationId);

Expand All @@ -222,7 +222,7 @@ public void deleteOrganization(Long organizationId) throws Exception {
}

public HttpInvoker.HttpResponse deleteOrganizationHttpResponse(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker httpInvoker = HttpInvoker.newHttpInvoker();
Expand Down Expand Up @@ -258,7 +258,7 @@ public HttpInvoker.HttpResponse deleteOrganizationHttpResponse(
return httpInvoker.invoke();
}

public Organization getOrganization(Long organizationId)
public Organization getOrganization(String organizationId)
throws Exception {

HttpInvoker.HttpResponse httpResponse = getOrganizationHttpResponse(
Expand All @@ -285,7 +285,7 @@ public Organization getOrganization(Long organizationId)
}

public HttpInvoker.HttpResponse getOrganizationHttpResponse(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker httpInvoker = HttpInvoker.newHttpInvoker();
Expand Down Expand Up @@ -322,7 +322,7 @@ public HttpInvoker.HttpResponse getOrganizationHttpResponse(
}

public Page<Organization> getOrganizationOrganizationsPage(
Long parentOrganizationId, Boolean flatten, String search,
String parentOrganizationId, Boolean flatten, String search,
String filterString, Pagination pagination, String sortString)
throws Exception {

Expand All @@ -344,7 +344,7 @@ public Page<Organization> getOrganizationOrganizationsPage(

public HttpInvoker.HttpResponse
getOrganizationOrganizationsPageHttpResponse(
Long parentOrganizationId, Boolean flatten, String search,
String parentOrganizationId, Boolean flatten, String search,
String filterString, Pagination pagination,
String sortString)
throws Exception {
Expand Down
8 changes: 4 additions & 4 deletions ...ent/src/main/java/com/liferay/headless/admin/user/client/resource/v1_0/PhoneResource.java
View file
Open in desktop
Expand Up @@ -38,11 +38,11 @@ public static Builder builder() {
return new Builder();
}

public Page<Phone> getOrganizationPhonesPage(Long organizationId)
public Page<Phone> getOrganizationPhonesPage(String organizationId)
throws Exception;

public HttpInvoker.HttpResponse getOrganizationPhonesPageHttpResponse(
Long organizationId)
String organizationId)
throws Exception;

public Phone getPhone(Long phoneId) throws Exception;
Expand Down Expand Up @@ -112,7 +112,7 @@ private Builder() {

public static class PhoneResourceImpl implements PhoneResource {

public Page<Phone> getOrganizationPhonesPage(Long organizationId)
public Page<Phone> getOrganizationPhonesPage(String organizationId)
throws Exception {

HttpInvoker.HttpResponse httpResponse =
Expand All @@ -130,7 +130,7 @@ public Page<Phone> getOrganizationPhonesPage(Long organizationId)
}

public HttpInvoker.HttpResponse getOrganizationPhonesPageHttpResponse(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker httpInvoker = HttpInvoker.newHttpInvoker();
Expand Down
9 changes: 5 additions & 4 deletions ...main/java/com/liferay/headless/admin/user/client/resource/v1_0/PostalAddressResource.java
View file
Open in desktop
Expand Up @@ -39,11 +39,12 @@ public static Builder builder() {
}

public Page<PostalAddress> getOrganizationPostalAddressesPage(
Long organizationId)
String organizationId)
throws Exception;

public HttpInvoker.HttpResponse
getOrganizationPostalAddressesPageHttpResponse(Long organizationId)
getOrganizationPostalAddressesPageHttpResponse(
String organizationId)
throws Exception;

public PostalAddress getPostalAddress(Long postalAddressId)
Expand Down Expand Up @@ -118,7 +119,7 @@ public static class PostalAddressResourceImpl
implements PostalAddressResource {

public Page<PostalAddress> getOrganizationPostalAddressesPage(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker.HttpResponse httpResponse =
Expand All @@ -137,7 +138,7 @@ public Page<PostalAddress> getOrganizationPostalAddressesPage(

public HttpInvoker.HttpResponse
getOrganizationPostalAddressesPageHttpResponse(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker httpInvoker = HttpInvoker.newHttpInvoker();
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/com/liferay/headless/admin/user/client/resource/v1_0/UserAccountResource.java
View file
Open in desktop
Expand Up @@ -45,12 +45,12 @@ public HttpInvoker.HttpResponse getMyUserAccountHttpResponse()
throws Exception;

public Page<UserAccount> getOrganizationUserAccountsPage(
Long organizationId, String search, String filterString,
String organizationId, String search, String filterString,
Pagination pagination, String sortString)
throws Exception;

public HttpInvoker.HttpResponse getOrganizationUserAccountsPageHttpResponse(
Long organizationId, String search, String filterString,
String organizationId, String search, String filterString,
Pagination pagination, String sortString)
throws Exception;

Expand Down Expand Up @@ -195,7 +195,7 @@ public HttpInvoker.HttpResponse getMyUserAccountHttpResponse()
}

public Page<UserAccount> getOrganizationUserAccountsPage(
Long organizationId, String search, String filterString,
String organizationId, String search, String filterString,
Pagination pagination, String sortString)
throws Exception {

Expand All @@ -217,7 +217,7 @@ public Page<UserAccount> getOrganizationUserAccountsPage(

public HttpInvoker.HttpResponse
getOrganizationUserAccountsPageHttpResponse(
Long organizationId, String search, String filterString,
String organizationId, String search, String filterString,
Pagination pagination, String sortString)
throws Exception {

Expand Down
8 changes: 4 additions & 4 deletions ...nt/src/main/java/com/liferay/headless/admin/user/client/resource/v1_0/WebUrlResource.java
View file
Open in desktop
Expand Up @@ -38,11 +38,11 @@ public static Builder builder() {
return new Builder();
}

public Page<WebUrl> getOrganizationWebUrlsPage(Long organizationId)
public Page<WebUrl> getOrganizationWebUrlsPage(String organizationId)
throws Exception;

public HttpInvoker.HttpResponse getOrganizationWebUrlsPageHttpResponse(
Long organizationId)
String organizationId)
throws Exception;

public Page<WebUrl> getUserAccountWebUrlsPage(Long userAccountId)
Expand Down Expand Up @@ -112,7 +112,7 @@ private Builder() {

public static class WebUrlResourceImpl implements WebUrlResource {

public Page<WebUrl> getOrganizationWebUrlsPage(Long organizationId)
public Page<WebUrl> getOrganizationWebUrlsPage(String organizationId)
throws Exception {

HttpInvoker.HttpResponse httpResponse =
Expand All @@ -130,7 +130,7 @@ public Page<WebUrl> getOrganizationWebUrlsPage(Long organizationId)
}

public HttpInvoker.HttpResponse getOrganizationWebUrlsPageHttpResponse(
Long organizationId)
String organizationId)
throws Exception {

HttpInvoker httpInvoker = HttpInvoker.newHttpInvoker();
Expand Down