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

Migrate Renarde with new migration script #99

Draft
wants to merge 1 commit into
base: 1.x
Choose a base branch
from
Draft

Migrate Renarde with new migration script #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ...ice/deployment/src/main/java/io/quarkiverse/renarde/backoffice/deployment/ModelField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import java.util.ArrayList;
import java.util.List;

import javax.persistence.Column;
import javax.persistence.Enumerated;
import javax.persistence.Lob;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.validation.constraints.NotEmpty;
import jakarta.persistence.Column;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Lob;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;
import jakarta.validation.constraints.NotEmpty;

import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationValue;
Expand Down
20 changes: 10 additions & 10 deletions ...rc/main/java/io/quarkiverse/renarde/backoffice/deployment/RenardeBackofficeProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
import java.util.Optional;
import java.util.function.Supplier;

import javax.enterprise.context.RequestScoped;
import javax.persistence.Entity;
import javax.transaction.Transactional;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.enterprise.context.RequestScoped;
import jakarta.persistence.Entity;
import jakarta.transaction.Transactional;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.ClassInfo;
Expand Down
2 changes: 1 addition & 1 deletion ...e/deployment/src/test/java/io/quarkiverse/renarde/backoffice/test/SecureEntitiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.net.URL;

import javax.persistence.Entity;
import jakarta.persistence.Entity;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
Expand Down
2 changes: 1 addition & 1 deletion ...ment/src/test/java/io/quarkiverse/renarde/backoffice/test/SecureEntitiesWithUserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.net.URL;
import java.util.Set;

import javax.persistence.Entity;
import jakarta.persistence.Entity;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
Expand Down
2 changes: 1 addition & 1 deletion ...deployment/src/test/java/io/quarkiverse/renarde/backoffice/test/SelectedEntitiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.net.URL;

import javax.persistence.Entity;
import jakarta.persistence.Entity;

import org.hamcrest.Matchers;
import org.jboss.shrinkwrap.api.ShrinkWrap;
Expand Down
2 changes: 1 addition & 1 deletion backoffice/runtime/src/main/java/io/quarkiverse/renarde/backoffice/impl/BackUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import java.util.Map;
import java.util.TreeMap;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;

import org.hibernate.engine.jdbc.BlobProxy;
import org.jboss.resteasy.reactive.multipart.FileUpload;
Expand Down
16 changes: 8 additions & 8 deletions deployment/src/main/java/io/quarkiverse/renarde/deployment/RenardeProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
import java.util.Optional;
import java.util.Set;

import javax.enterprise.context.RequestScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
import javax.transaction.Transactional;
import javax.ws.rs.Priorities;
import jakarta.enterprise.context.RequestScoped;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.inject.Singleton;
import jakarta.transaction.Transactional;
import jakarta.ws.rs.Priorities;

import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
Expand Down
2 changes: 1 addition & 1 deletion deployment/src/test/java/io/quarkiverse/renarde/test/AugmentedController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.net.URI;

import javax.ws.rs.core.UriBuilder;
import jakarta.ws.rs.core.UriBuilder;

import org.jboss.resteasy.reactive.RestPath;
import org.jboss.resteasy.reactive.RestQuery;
Expand Down
4 changes: 2 additions & 2 deletions deployment/src/test/java/io/quarkiverse/renarde/test/LoginControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.util.Map;
import java.util.Set;

import javax.enterprise.context.ApplicationScoped;
import javax.ws.rs.Path;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.Path;

import org.hamcrest.Matchers;
import org.jboss.shrinkwrap.api.ShrinkWrap;
Expand Down
4 changes: 2 additions & 2 deletions deployment/src/test/java/io/quarkiverse/renarde/test/NoLoginControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.util.Collections;
import java.util.Set;

import javax.enterprise.context.ApplicationScoped;
import javax.ws.rs.Path;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.Path;

import org.hamcrest.Matchers;
import org.jboss.shrinkwrap.api.ShrinkWrap;
Expand Down
20 changes: 10 additions & 10 deletions docs/modules/ROOT/pages/index.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Let's see how you can quickly build a Web Application with Renarde. Let's start
----
package rest;

import javax.ws.rs.Path;
import jakarta.ws.rs.Path;

import io.quarkus.qute.CheckedTemplate;
import io.quarkus.qute.TemplateInstance;
Expand Down Expand Up @@ -81,8 +81,8 @@ package model;
import java.util.Date;
import java.util.List;

import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToOne;

import io.quarkus.hibernate.orm.panache.PanacheEntity;

Expand Down Expand Up @@ -118,8 +118,8 @@ package rest;
import java.util.Date;
import java.util.List;

import javax.validation.constraints.NotBlank;
import javax.ws.rs.POST;
import jakarta.validation.constraints.NotBlank;
import jakarta.ws.rs.POST;

import org.jboss.resteasy.reactive.RestForm;
import org.jboss.resteasy.reactive.RestPath;
Expand Down Expand Up @@ -716,8 +716,8 @@ will not be called and will be replaced by a redirect that points to the endpoin
----
package rest;

import javax.ws.rs.POST;
import javax.ws.rs.Path;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;

import io.quarkus.qute.CheckedTemplate;
import io.quarkus.qute.TemplateInstance;
Expand Down Expand Up @@ -751,8 +751,8 @@ If there are any parameters that form the URI, you must pass them along:
----
package rest;

import javax.ws.rs.POST;
import javax.ws.rs.Path;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;

import org.jboss.resteasy.reactive.RestPath;
import org.jboss.resteasy.reactive.RestQuery;
Expand Down Expand Up @@ -794,7 +794,7 @@ If you want to redirect to another controller, you can use the `redirect(Class)`
----
package rest;

import javax.ws.rs.POST;
import jakarta.ws.rs.POST;

import io.quarkiverse.renarde.Controller;

Expand Down
48 changes: 24 additions & 24 deletions docs/modules/ROOT/pages/security.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ package model;
import java.util.HashSet;
import java.util.Set;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Table;

import io.quarkiverse.renarde.security.RenardeUser;
import io.quarkus.hibernate.orm.panache.PanacheEntity;
Expand Down Expand Up @@ -110,8 +110,8 @@ Now tell Renarde how to map the JWT cookies to your user model by implementing `
----
package util;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

import io.quarkiverse.renarde.security.RenardeSecurity;
import io.quarkiverse.renarde.security.RenardeUser;
Expand Down Expand Up @@ -217,13 +217,13 @@ package rest;

import java.util.UUID;

import javax.inject.Inject;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.ws.rs.POST;
import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import jakarta.inject.Inject;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.core.NewCookie;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.ResponseBuilder;

import org.hibernate.validator.constraints.Length;
import org.jboss.resteasy.reactive.RestForm;
Expand Down Expand Up @@ -480,12 +480,12 @@ package model;
import java.util.HashSet;
import java.util.Set;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;

import io.quarkiverse.renarde.security.RenardeUser;
import io.quarkus.hibernate.orm.panache.PanacheEntity;
Expand Down Expand Up @@ -569,10 +569,10 @@ package util;
import java.net.URI;
import java.util.UUID;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.transaction.Transactional;
import javax.ws.rs.core.Response;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional;
import jakarta.ws.rs.core.Response;

import io.quarkiverse.renarde.oidc.RenardeOidcHandler;
import io.quarkiverse.renarde.oidc.RenardeOidcSecurity;
Expand Down
18 changes: 9 additions & 9 deletions integration-tests/src/main/java/model/ExampleEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
import java.util.Date;
import java.util.List;

import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.Enumerated;
import javax.persistence.Lob;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import jakarta.persistence.Column;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.Enumerated;
import jakarta.persistence.Lob;
import jakarta.persistence.ManyToMany;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne;

import io.quarkiverse.renarde.jpa.NamedBlob;
import io.quarkus.hibernate.orm.panache.PanacheEntity;
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/main/java/model/ManyToManyNotOwningEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.List;

import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToMany;

import io.quarkus.hibernate.orm.panache.PanacheEntity;

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/main/java/model/ManyToManyOwningEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.List;

import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToMany;

import io.quarkus.hibernate.orm.panache.PanacheEntity;

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/main/java/model/ManyToOneEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package model;

import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.ManyToOne;

import io.quarkus.hibernate.orm.panache.PanacheEntity;

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/main/java/model/OneToManyEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.List;

import javax.persistence.Entity;
import javax.persistence.OneToMany;
import jakarta.persistence.Entity;
import jakarta.persistence.OneToMany;

import io.quarkus.hibernate.orm.panache.PanacheEntity;

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/main/java/model/OneToOneNotOwningEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package model;

import javax.persistence.Entity;
import javax.persistence.OneToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.OneToOne;

import io.quarkus.hibernate.orm.panache.PanacheEntity;

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/main/java/model/OneToOneOwningEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package model;

import javax.persistence.Entity;
import javax.persistence.OneToOne;
import jakarta.persistence.Entity;
import jakarta.persistence.OneToOne;

import io.quarkus.hibernate.orm.panache.PanacheEntity;

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/main/java/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.util.HashSet;
import java.util.Set;

import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;

import io.quarkiverse.renarde.security.RenardeUserWithPassword;
import io.quarkus.elytron.security.common.BcryptUtil;
Expand Down
Loading