Skip to content

Commit

Permalink
Merge pull request #30923 from ia3andy/fix-base-codestarts
Browse files Browse the repository at this point in the history 
Keep 2.x extensions codestarts embedded in tooling and mark them legacy
  • Loading branch information
@aloubyansky
aloubyansky authored Feb 7, 2023
2 parents e664271 + cc4a8b7 commit e48aace
Show file tree
Hide file tree
Showing 48 changed files with 67 additions and 65 deletions.
2 changes: 2 additions & 0 deletions ...ts/src/main/resources/codestarts/quarkus/legacy-extensions-codestarts/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Those extensions codestarts are used with Quarkus platform 2.10 and below.
From 2.11 and onward, they are provided by the platform.
0 ...esteasy-codestart/base/README.tpl.qute.md → ...esteasy-codestart/base/README.tpl.qute.md
View file
File renamed without changes.
0 .../META-INF/resources/index.entry.qute.html → .../META-INF/resources/index.entry.qute.html
View file
File renamed without changes.
0 ...destarts/resteasy-codestart/codestart.yml → ...destarts/resteasy-codestart/codestart.yml
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions .../acme/{resource.class-name}.tpl.qute.java → .../acme/{resource.class-name}.tpl.qute.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.acme;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("{resource.path}")
public class {resource.class-name} {
Expand All @@ -13,4 +13,4 @@ public class {resource.class-name} {
public String hello() {
return "{resource.response}";
}
}
}
0 ...cme/{resource.class-name}IT.tpl.qute.java → ...cme/{resource.class-name}IT.tpl.qute.java
View file
File renamed without changes.
0 ...e/{resource.class-name}Test.tpl.qute.java → ...e/{resource.class-name}Test.tpl.qute.java
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions ...rg/acme/{resource.class-name}.tpl.qute.kt → ...rg/acme/{resource.class-name}.tpl.qute.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.acme

import jakarta.ws.rs.GET
import jakarta.ws.rs.Path
import jakarta.ws.rs.Produces
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.Produces
import javax.ws.rs.core.MediaType

@Path("{resource.path}")
class {resource.class-name} {
Expand Down
0 .../acme/{resource.class-name}IT.tpl.qute.kt → .../acme/{resource.class-name}IT.tpl.qute.kt
View file
File renamed without changes.
0 ...cme/{resource.class-name}Test.tpl.qute.kt → ...cme/{resource.class-name}Test.tpl.qute.kt
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...acme/{resource.class-name}.tpl.qute.scala → ...acme/{resource.class-name}.tpl.qute.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.acme

import jakarta.ws.rs.\{GET, Path, Produces}
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.\{GET, Path, Produces}
import javax.ws.rs.core.MediaType

@Path("{resource.path}")
class {resource.class-name} {
Expand Down
0 ...me/{resource.class-name}IT.tpl.qute.scala → ...me/{resource.class-name}IT.tpl.qute.scala
View file
File renamed without changes.
0 .../{resource.class-name}Test.tpl.qute.scala → .../{resource.class-name}Test.tpl.qute.scala
View file
File renamed without changes.
0 ...eactive-codestart/base/README.tpl.qute.md → ...eactive-codestart/base/README.tpl.qute.md
View file
File renamed without changes.
0 .../META-INF/resources/index.entry.qute.html → .../META-INF/resources/index.entry.qute.html
View file
File renamed without changes.
0 ...resteasy-reactive-codestart/codestart.yml → ...resteasy-reactive-codestart/codestart.yml
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions .../acme/{resource.class-name}.tpl.qute.java → .../acme/{resource.class-name}.tpl.qute.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.acme;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("{resource.path}")
public class {resource.class-name} {
Expand All @@ -13,4 +13,4 @@ public class {resource.class-name} {
public String hello() {
return "{resource.response}";
}
}
}
0 ...cme/{resource.class-name}IT.tpl.qute.java → ...cme/{resource.class-name}IT.tpl.qute.java
View file
File renamed without changes.
0 ...e/{resource.class-name}Test.tpl.qute.java → ...e/{resource.class-name}Test.tpl.qute.java
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions ...rg/acme/{resource.class-name}.tpl.qute.kt → ...rg/acme/{resource.class-name}.tpl.qute.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.acme

import jakarta.ws.rs.GET
import jakarta.ws.rs.Path
import jakarta.ws.rs.Produces
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.Produces
import javax.ws.rs.core.MediaType

@Path("{resource.path}")
class {resource.class-name} {
Expand Down
0 .../acme/{resource.class-name}IT.tpl.qute.kt → .../acme/{resource.class-name}IT.tpl.qute.kt
View file
File renamed without changes.
0 ...cme/{resource.class-name}Test.tpl.qute.kt → ...cme/{resource.class-name}Test.tpl.qute.kt
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...acme/{resource.class-name}.tpl.qute.scala → ...acme/{resource.class-name}.tpl.qute.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.acme

import jakarta.ws.rs.\{GET, Path, Produces}
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.\{GET, Path, Produces}
import javax.ws.rs.core.MediaType

@Path("{resource.path}")
class {resource.class-name} {
Expand Down
0 ...me/{resource.class-name}IT.tpl.qute.scala → ...me/{resource.class-name}IT.tpl.qute.scala
View file
File renamed without changes.
0 .../{resource.class-name}Test.tpl.qute.scala → .../{resource.class-name}Test.tpl.qute.scala
View file
File renamed without changes.
0 ...ing-web-codestart/base/README.tpl.qute.md → ...ing-web-codestart/base/README.tpl.qute.md
View file
File renamed without changes.
0 .../META-INF/resources/index.entry.qute.html → .../META-INF/resources/index.entry.qute.html
View file
File renamed without changes.
0 ...starts/spring-web-codestart/codestart.yml → ...starts/spring-web-codestart/codestart.yml
View file
File renamed without changes.
0 .../acme/{resource.class-name}.tpl.qute.java → .../acme/{resource.class-name}.tpl.qute.java
View file
File renamed without changes.
0 ...cme/{resource.class-name}IT.tpl.qute.java → ...cme/{resource.class-name}IT.tpl.qute.java
View file
File renamed without changes.
0 ...e/{resource.class-name}Test.tpl.qute.java → ...e/{resource.class-name}Test.tpl.qute.java
View file
File renamed without changes.
0 ...rg/acme/{resource.class-name}.tpl.qute.kt → ...rg/acme/{resource.class-name}.tpl.qute.kt
View file
File renamed without changes.
0 .../acme/{resource.class-name}IT.tpl.qute.kt → .../acme/{resource.class-name}IT.tpl.qute.kt
View file
File renamed without changes.
0 ...cme/{resource.class-name}Test.tpl.qute.kt → ...cme/{resource.class-name}Test.tpl.qute.kt
View file
File renamed without changes.
0 ...acme/{resource.class-name}.tpl.qute.scala → ...acme/{resource.class-name}.tpl.qute.scala
View file
File renamed without changes.
0 ...me/{resource.class-name}IT.tpl.qute.scala → ...me/{resource.class-name}IT.tpl.qute.scala
View file
File renamed without changes.
0 .../{resource.class-name}Test.tpl.qute.scala → .../{resource.class-name}Test.tpl.qute.scala
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions ...startGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.acme;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("/hello")
public class GreetingResource {
Expand All @@ -13,4 +13,4 @@ public class GreetingResource {
public String hello() {
return "Hello from RESTEasy Reactive";
}
}
}
10 changes: 5 additions & 5 deletions ...tartGenerationTest/generateMavenResteasyJava/src_main_java_org_acme_GreetingResource.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.acme;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("/hello")
public class GreetingResource {
Expand All @@ -13,4 +13,4 @@ public class GreetingResource {
public String hello() {
return "Hello RESTEasy";
}
}
}
10 changes: 5 additions & 5 deletions ...tartGenerationTest/generateRESTEasyJavaCustom/src_main_java_com_andy_BonjourResource.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.andy;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("/bonjour")
public class BonjourResource {
Expand All @@ -13,4 +13,4 @@ public class BonjourResource {
public String hello() {
return "Hello RESTEasy";
}
}
}
8 changes: 4 additions & 4 deletions ...rtGenerationTest/generateRESTEasyKotlinCustom/src_main_kotlin_com_andy_BonjourResource.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.andy

import jakarta.ws.rs.GET
import jakarta.ws.rs.Path
import jakarta.ws.rs.Produces
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.Produces
import javax.ws.rs.core.MediaType

@Path("/bonjour")
class BonjourResource {
Expand Down
4 changes: 2 additions & 2 deletions ...tGenerationTest/generateRESTEasyScalaCustom/src_main_scala_com_andy_BonjourResource.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.andy

import jakarta.ws.rs.{GET, Path, Produces}
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.{GET, Path, Produces}
import javax.ws.rs.core.MediaType

@Path("/bonjour")
class BonjourResource {
Expand Down
10 changes: 5 additions & 5 deletions ...ts__/RESTEasyCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ilove.quark.us;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("/hello")
public class GreetingResource {
Expand All @@ -13,4 +13,4 @@ public class GreetingResource {
public String hello() {
return "Hello RESTEasy";
}
}
}
8 changes: 4 additions & 4 deletions ...ts__/RESTEasyCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ilove.quark.us

import jakarta.ws.rs.GET
import jakarta.ws.rs.Path
import jakarta.ws.rs.Produces
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.Produces
import javax.ws.rs.core.MediaType

@Path("/hello")
class GreetingResource {
Expand Down
4 changes: 2 additions & 2 deletions ...__/RESTEasyCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ilove.quark.us

import jakarta.ws.rs.{GET, Path, Produces}
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.{GET, Path, Produces}
import javax.ws.rs.core.MediaType

@Path("/hello")
class GreetingResource {
Expand Down
10 changes: 5 additions & 5 deletions ...TEasyReactiveCodestartTest/testContent/src_main_java_ilove_quark_us_GreetingResource.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ilove.quark.us;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;

@Path("/hello")
public class GreetingResource {
Expand All @@ -13,4 +13,4 @@ public class GreetingResource {
public String hello() {
return "Hello from RESTEasy Reactive";
}
}
}
8 changes: 4 additions & 4 deletions ...TEasyReactiveCodestartTest/testContent/src_main_kotlin_ilove_quark_us_GreetingResource.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ilove.quark.us

import jakarta.ws.rs.GET
import jakarta.ws.rs.Path
import jakarta.ws.rs.Produces
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.Produces
import javax.ws.rs.core.MediaType

@Path("/hello")
class GreetingResource {
Expand Down
4 changes: 2 additions & 2 deletions ...asyReactiveCodestartTest/testContent/src_main_scala_ilove_quark_us_GreetingResource.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ilove.quark.us

import jakarta.ws.rs.{GET, Path, Produces}
import jakarta.ws.rs.core.MediaType
import javax.ws.rs.{GET, Path, Produces}
import javax.ws.rs.core.MediaType

@Path("/hello")
class GreetingResource {
Expand Down

0 comments on commit e48aace

Please sign in to comment.