diff --git a/src/main/java/com/example/jenkinstest/JerseyConfig.java b/src/main/java/com/example/jenkinstest/JerseyConfig.java index 8dd9f2c..59b59bd 100644 --- a/src/main/java/com/example/jenkinstest/JerseyConfig.java +++ b/src/main/java/com/example/jenkinstest/JerseyConfig.java @@ -1,13 +1,14 @@ package com.example.jenkinstest; +import jakarta.ws.rs.ApplicationPath; import org.glassfish.jersey.server.ResourceConfig; -import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; -@Configuration +@Component public class JerseyConfig extends ResourceConfig { public JerseyConfig() { - packages("com.example.jenkinstest.controllers"); + packages("com.example.jenkinstest.resources"); } } diff --git a/src/main/java/com/example/jenkinstest/controllers/TestController.java b/src/main/java/com/example/jenkinstest/controllers/TestController.java deleted file mode 100644 index a5ecbb9..0000000 --- a/src/main/java/com/example/jenkinstest/controllers/TestController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.example.jenkinstest.controllers; - -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import org.springframework.stereotype.Controller; - -import javax.print.attribute.standard.Media; - -@Controller -@Path("/") -public class TestController { - - //aaa - @Path("/test") - @GET - @Produces(MediaType.APPLICATION_JSON) - public Response test() { - return Response.status(Response.Status.OK).entity("{\"message\": \"hello world!\"}").build(); - } - - @Path("") - @GET - @Produces(MediaType.APPLICATION_JSON) - public Response test2() { - return Response.status(Response.Status.OK).entity("{\"message\": \"hello world2!\"}").build(); - } - -} diff --git a/src/main/java/com/example/jenkinstest/resources/TestResource.java b/src/main/java/com/example/jenkinstest/resources/TestResource.java new file mode 100644 index 0000000..06517f2 --- /dev/null +++ b/src/main/java/com/example/jenkinstest/resources/TestResource.java @@ -0,0 +1,16 @@ +package com.example.jenkinstest.resources; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import org.springframework.stereotype.Component; + +@Path("") +@Component +public class TestResource { + + @GET + public String hello() { + return "hello"; + } + +}