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

refactor!: migrate to Jakarta #1034

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

refactor!: migrate to Jakarta #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83da497
refactor!: migrate to Jakarta
malteo Jul 1, 2024
dc5b7e8
bump version
malteo Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions base-api-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.cloudesire.platform</groupId>
<artifactId>cloudesire-api-client-root</artifactId>
<version>3.9.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>base-api-client</artifactId>
Expand All @@ -20,7 +20,7 @@
<dependency>
<groupId>com.cloudesire.platform</groupId>
<artifactId>common-dto</artifactId>
<version>3.9.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.squareup.retrofit2</groupId>
Expand Down Expand Up @@ -53,9 +53,9 @@
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion ...nt/src/main/java/com/cloudesire/platform/apiclient/response/error/ErrorResponseEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.liberologico.cloudesire.common.Slugger;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions cloudesire-api-client-dto/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.cloudesire.platform</groupId>
<artifactId>cloudesire-api-client-root</artifactId>
<version>3.9.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>cloudesire-api-client-dto</artifactId>
Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>com.cloudesire.platform</groupId>
<artifactId>base-api-client</artifactId>
<version>3.9.1-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...t-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/AccessControlDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.cloudesire.platform.apiclient.dto.model.enums.Permission;
import com.cloudesire.platform.apiclient.dto.model.enums.UserRole;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import java.util.Objects;

Expand Down
2 changes: 1 addition & 1 deletion ...-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/AddressDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.Size;
import jakarta.validation.constraints.Size;
import java.io.Serializable;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...ent-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ApiEndpointDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.liberologico.cloudesire.common.enums.HttpMethod;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.util.Objects;

@Schema( description = "A billed HTTP endpoint" )
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ApplicationCredentialDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.util.Objects;

abstract class ApplicationCredentialDTO
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/cloudesire/platform/apiclient/dto/model/dto/ApplicationCredentialInputDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.util.Map;
import java.util.Objects;

Expand Down
2 changes: 1 addition & 1 deletion ...ent-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ApplicationDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions ...dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ApplicationFileDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.NotEmpty;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/cloudesire/platform/apiclient/dto/model/dto/ApplicationFileEnvironmentDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.Objects;

@Schema( description = "Environment variables for an application" )
Expand Down
4 changes: 2 additions & 2 deletions ...o/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ApplicationMetricDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.Objects;

public class ApplicationMetricDTO extends BaseEntityDTO
Expand Down
4 changes: 2 additions & 2 deletions ...to/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BandwidthPricingDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...ent-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseInvoiceDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.Date;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...lient-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseOrderDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import com.liberologico.cloudesire.common.enums.OSType;
import com.liberologico.cloudesire.common.enums.dto.ActionUrlDTO;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Objects;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseResellingPriceDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Objects;

abstract class BaseResellingPriceDTO extends BaseEntityDTO
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BaseSubscriptionV1DTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import org.hibernate.validator.constraints.Length;

import javax.validation.Valid;
import jakarta.validation.Valid;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingBudgetAmountDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;

import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY;
Expand Down
4 changes: 2 additions & 2 deletions ...t-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingBudgetDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingBudgetFilterDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.cloudesire.platform.apiclient.dto.model.enums.CalendarPeriod;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.Map;
import java.util.Objects;

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingBudgetPeriodDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.cloudesire.platform.apiclient.dto.model.enums.CalendarPeriod;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Objects;

@Schema( description = "Timeframe definition for a billing budget. Either a calendar or a custom period can be defined." )
Expand Down
8 changes: 4 additions & 4 deletions .../main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingBudgetThresholdDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.liberologico.cloudesire.common.Regexp;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.Email;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.ZonedDateTime;
import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions ...ent-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.math.BigDecimal;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...in/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemResellingPriceDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions .../main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemSellinPriceDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Objects;

Expand Down
10 changes: 5 additions & 5 deletions ...to/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.validation.Valid;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.math.BigDecimal;
import java.util.Objects;

Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BillingItemValueV1DTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.Min;
import jakarta.validation.constraints.Min;
import java.math.BigDecimal;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...i-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BudgetDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
Expand Down
6 changes: 3 additions & 3 deletions ...ent-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BudgetInputDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.liberologico.cloudesire.common.enums.OSType;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import java.util.Date;
import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion ...client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/CardDataDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.hibernate.validator.constraints.CreditCardNumber;
import org.hibernate.validator.constraints.NotEmpty;

import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.Pattern;
import java.util.HashMap;
import java.util.Map;

Expand Down
4 changes: 2 additions & 2 deletions ...api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/CartDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cloudesire.platform.apiclient.dto.model.dto;

import javax.validation.Valid;
import javax.validation.constraints.Size;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Size;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions ...client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/CartItemDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import com.liberologico.cloudesire.common.enums.OSType;

import javax.validation.Valid;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down
4 changes: 2 additions & 2 deletions ...dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/CloudCredentialDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.Objects;

import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY;
Expand Down
4 changes: 2 additions & 2 deletions ...nt-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/CloudPricingDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import io.swagger.v3.oas.annotations.media.Schema;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/cloudesire/platform/apiclient/dto/model/dto/CloudPricingResellingPriceDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.cloudesire.platform.apiclient.dto.model.enums.ResellingConfigurationType;

import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Map;
import java.util.Objects;
Expand Down
Loading