Skip to content

Commit dcafed7

Browse files
timis1timis1
and
timis1
authored
JAVA-23211 Upgrade dependencies versions for helidon-mp module (eugenp#14472)
Co-authored-by: timis1 <[email protected]>
1 parent b1aa672 commit dcafed7

File tree

8 files changed

+58
-57
lines changed

8 files changed

+58
-57
lines changed

microservices-modules/helidon/helidon-mp/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependencies>
1616
<dependency>
1717
<groupId>io.helidon.microprofile.bundles</groupId>
18-
<artifactId>helidon-microprofile-1.2</artifactId>
18+
<artifactId>helidon-microprofile</artifactId>
1919
<version>${helidon-microprofile.version}</version>
2020
</dependency>
2121
<dependency>
@@ -26,8 +26,8 @@
2626
</dependencies>
2727

2828
<properties>
29-
<helidon-microprofile.version>0.10.4</helidon-microprofile.version>
30-
<jersey-media-json-binding.version>2.26</jersey-media-json-binding.version>
29+
<helidon-microprofile.version>3.2.2</helidon-microprofile.version>
30+
<jersey-media-json-binding.version>3.1.2</jersey-media-json-binding.version>
3131
</properties>
3232

3333
</project>

microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/LibraryApplication.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package com.baeldung.microprofile;
22

33
import com.baeldung.microprofile.web.BookEndpoint;
4-
import io.helidon.common.CollectionsHelper;
54
import io.helidon.microprofile.server.Server;
5+
import jakarta.ws.rs.ApplicationPath;
6+
import jakarta.ws.rs.core.Application;
67

7-
import javax.ws.rs.ApplicationPath;
8-
import javax.ws.rs.core.Application;
98
import java.util.Set;
109

1110
@ApplicationPath("/library")
1211
public class LibraryApplication extends Application {
1312

1413
@Override
1514
public Set<Class<?>> getClasses() {
16-
return CollectionsHelper.setOf(BookEndpoint.class);
15+
return Set.of(BookEndpoint.class);
1716
}
1817

1918
public static void main(String... args) {

microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookListMessageBodyWriter.java

+13-11
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
import com.baeldung.microprofile.model.Book;
44
import com.baeldung.microprofile.util.BookMapper;
55

6-
import javax.json.Json;
7-
import javax.json.JsonArray;
8-
import javax.json.JsonWriter;
9-
import javax.ws.rs.Produces;
10-
import javax.ws.rs.WebApplicationException;
11-
import javax.ws.rs.core.MediaType;
12-
import javax.ws.rs.core.MultivaluedMap;
13-
import javax.ws.rs.ext.MessageBodyWriter;
14-
import javax.ws.rs.ext.Provider;
15-
import java.io.IOException;
166
import java.io.OutputStream;
177
import java.lang.annotation.Annotation;
188
import java.lang.reflect.Type;
199
import java.util.List;
2010

11+
import jakarta.json.Json;
12+
import jakarta.json.JsonArray;
13+
import jakarta.json.JsonWriter;
14+
import jakarta.ws.rs.Produces;
15+
import jakarta.ws.rs.WebApplicationException;
16+
import jakarta.ws.rs.core.MediaType;
17+
import jakarta.ws.rs.core.MultivaluedMap;
18+
import jakarta.ws.rs.ext.MessageBodyWriter;
19+
import jakarta.ws.rs.ext.Provider;
20+
2121
@Provider
2222
@Produces(MediaType.APPLICATION_JSON)
2323
public class BookListMessageBodyWriter implements MessageBodyWriter<List<Book>> {
@@ -33,7 +33,9 @@ public long getSize(List<Book> books, Class<?> type, Type genericType, Annotatio
3333
}
3434

3535
@Override
36-
public void writeTo(List<Book> books, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
36+
public void writeTo(
37+
List<Book> books, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
38+
MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws WebApplicationException {
3739
JsonWriter jsonWriter = Json.createWriter(entityStream);
3840
JsonArray jsonArray = BookMapper.map(books);
3941
jsonWriter.writeArray(jsonArray);

microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyReader.java

+11-7
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
import com.baeldung.microprofile.model.Book;
44
import com.baeldung.microprofile.util.BookMapper;
55

6-
import javax.ws.rs.Consumes;
7-
import javax.ws.rs.WebApplicationException;
8-
import javax.ws.rs.core.MediaType;
9-
import javax.ws.rs.core.MultivaluedMap;
10-
import javax.ws.rs.ext.MessageBodyReader;
11-
import javax.ws.rs.ext.Provider;
126
import java.io.IOException;
137
import java.io.InputStream;
148
import java.lang.annotation.Annotation;
159
import java.lang.reflect.Type;
1610

11+
import jakarta.ws.rs.Consumes;
12+
import jakarta.ws.rs.WebApplicationException;
13+
import jakarta.ws.rs.core.MediaType;
14+
import jakarta.ws.rs.core.MultivaluedMap;
15+
import jakarta.ws.rs.ext.MessageBodyReader;
16+
import jakarta.ws.rs.ext.Provider;
17+
1718
@Provider
1819
@Consumes(MediaType.APPLICATION_JSON)
1920
public class BookMessageBodyReader implements MessageBodyReader<Book> {
@@ -24,7 +25,10 @@ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotati
2425
}
2526

2627
@Override
27-
public Book readFrom(Class<Book> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException, WebApplicationException {
28+
public Book readFrom(
29+
Class<Book> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders,
30+
InputStream entityStream
31+
) throws IOException, WebApplicationException {
2832
return BookMapper.map(entityStream);
2933
}
3034
}

microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/providers/BookMessageBodyWriter.java

+14-24
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import com.baeldung.microprofile.model.Book;
44
import com.baeldung.microprofile.util.BookMapper;
55

6-
import javax.json.Json;
7-
import javax.json.JsonObject;
8-
import javax.json.JsonWriter;
9-
import javax.ws.rs.Produces;
10-
import javax.ws.rs.WebApplicationException;
11-
import javax.ws.rs.core.MediaType;
12-
import javax.ws.rs.core.MultivaluedMap;
13-
import javax.ws.rs.ext.MessageBodyWriter;
14-
import javax.ws.rs.ext.Provider;
15-
import java.io.IOException;
6+
import jakarta.json.Json;
7+
import jakarta.json.JsonObject;
8+
import jakarta.json.JsonWriter;
169
import java.io.OutputStream;
1710
import java.lang.annotation.Annotation;
1811
import java.lang.reflect.Type;
1912

13+
import jakarta.ws.rs.Produces;
14+
import jakarta.ws.rs.WebApplicationException;
15+
import jakarta.ws.rs.core.MediaType;
16+
import jakarta.ws.rs.core.MultivaluedMap;
17+
import jakarta.ws.rs.ext.MessageBodyWriter;
18+
import jakarta.ws.rs.ext.Provider;
19+
2020
@Provider
2121
@Produces(MediaType.APPLICATION_JSON)
2222
public class BookMessageBodyWriter implements MessageBodyWriter<Book> {
@@ -33,21 +33,11 @@ public long getSize(Book book, Class<?> type, Type genericType, Annotation[] ann
3333
return 0;
3434
}
3535

36-
/**
37-
* Marsahl Book to OutputStream
38-
*
39-
* @param book
40-
* @param type
41-
* @param genericType
42-
* @param annotations
43-
* @param mediaType
44-
* @param httpHeaders
45-
* @param entityStream
46-
* @throws IOException
47-
* @throws WebApplicationException
48-
*/
4936
@Override
50-
public void writeTo(Book book, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException {
37+
public void writeTo(
38+
Book book, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders,
39+
OutputStream entityStream
40+
) throws WebApplicationException {
5141
JsonWriter jsonWriter = Json.createWriter(entityStream);
5242
JsonObject jsonObject = BookMapper.map(book);
5343
jsonWriter.writeObject(jsonObject);

microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/repo/BookManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.baeldung.microprofile.model.Book;
44

5-
import javax.enterprise.context.ApplicationScoped;
5+
import jakarta.enterprise.context.ApplicationScoped;
66
import java.time.LocalDate;
77
import java.time.format.DateTimeFormatter;
88
import java.util.ArrayList;

microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/util/BookMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.baeldung.microprofile.model.Book;
44

5-
import javax.json.*;
5+
import jakarta.json.*;
66
import java.io.InputStream;
77
import java.util.List;
88

microservices-modules/helidon/helidon-mp/src/main/java/com/baeldung/microprofile/web/BookEndpoint.java

+12-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@
33
import com.baeldung.microprofile.model.Book;
44
import com.baeldung.microprofile.repo.BookManager;
55

6-
import javax.enterprise.context.RequestScoped;
7-
import javax.inject.Inject;
8-
import javax.ws.rs.*;
9-
import javax.ws.rs.core.MediaType;
10-
import javax.ws.rs.core.Response;
11-
import javax.ws.rs.core.UriBuilder;
6+
import jakarta.enterprise.context.RequestScoped;
7+
import jakarta.inject.Inject;
8+
9+
import jakarta.ws.rs.Consumes;
10+
import jakarta.ws.rs.GET;
11+
import jakarta.ws.rs.POST;
12+
import jakarta.ws.rs.Path;
13+
import jakarta.ws.rs.PathParam;
14+
import jakarta.ws.rs.Produces;
15+
import jakarta.ws.rs.core.MediaType;
16+
import jakarta.ws.rs.core.Response;
17+
import jakarta.ws.rs.core.UriBuilder;
1218

1319
@Path("books")
1420
@RequestScoped

0 commit comments

Comments
 (0)