Skip to content

Commit 6e22eba

Browse files
authored
Upgrading to the latest Jersey 2.35 (helidon-io#3397)
* Upgrading to the latest Jersey 2.35. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com> * Implemented new Jersey interface method. Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
1 parent 57eec28 commit 6e22eba

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
8383
<version.lib.jaxb-runtime>2.3.3</version.lib.jaxb-runtime>
8484
<version.lib.jedis>3.6.3</version.lib.jedis>
85-
<version.lib.jersey>2.34</version.lib.jersey>
85+
<version.lib.jersey>2.35</version.lib.jersey>
8686
<version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
8787
<version.lib.jms-api>2.0</version.lib.jms-api>
8888
<version.lib.jsonb-api>1.0.2</version.lib.jsonb-api>

webserver/jersey/src/main/java/io/helidon/webserver/jersey/HelidonHK2InjectionManagerFactory.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,15 @@ public boolean isRegistrable(Class<?> clazz) {
155155
return shared.isRegistrable(clazz) || forApplication.isRegistrable(clazz);
156156
}
157157

158+
@Override
159+
public <T> T create(Class<T> createMe) {
160+
try {
161+
return shared.create(createMe);
162+
} catch (Throwable t) {
163+
return forApplication.create(createMe);
164+
}
165+
}
166+
158167
@Override
159168
public <T> T createAndInitialize(Class<T> createMe) {
160169
try {
@@ -365,6 +374,11 @@ public boolean isRegistrable(Class<?> clazz) {
365374
throw new UnsupportedOperationException("Not supported");
366375
}
367376

377+
@Override
378+
public <T> T create(Class<T> createMe) {
379+
throw new UnsupportedOperationException("Not supported");
380+
}
381+
368382
@Override
369383
public <T> T createAndInitialize(Class<T> createMe) {
370384
throw new UnsupportedOperationException("Not supported");

0 commit comments

Comments
 (0)