Drop unnecessary JerseyEntityPart (#4904)

* Drop unnecessary JerseyEntityPart

Signed-off-by: jansupol <[email protected]>

Author: jansupol

core-common/src/main/java/org/glassfish/jersey/innate/multipart/JerseyEntityPart.java

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -42,8 +43,6 @@
 import jakarta.inject.Provider;
 import jakarta.inject.Singleton;
 
-import jakarta.ws.rs.ext.RuntimeDelegate;
-import org.glassfish.jersey.innate.multipart.JerseyEntityPart;
 import org.glassfish.jersey.internal.inject.ExtractorException;
 import org.glassfish.jersey.internal.inject.InjectionManager;
 import org.glassfish.jersey.internal.inject.Providers;
@@ -267,10 +266,10 @@ public Object apply(ContainerRequest containerRequest, Parameter parameter) {
             if (entityPartProvider.get() != null) { // else jersey-multipart module is missing
                 final Function<ContainerRequest, ?> valueSupplier = entityPartProvider.get().getValueProvider(
                         new WrappingFormParamParameter(entityPartParameter, parameter));
-                final JerseyEntityPart entityPart = (JerseyEntityPart) valueSupplier.apply(containerRequest);
+                final EntityPart entityPart = (EntityPart) valueSupplier.apply(containerRequest);
                 try {
                     entity = parameter.getType() != parameter.getRawType()
-                            ? entityPart.getContent(parameter.getRawType(), parameter.getType())
+                            ? entityPart.getContent(genericType(parameter.getRawType(), parameter.getType()))
                             : entityPart.getContent(parameter.getRawType());
                 } catch (IOException e) {
                     throw new ProcessingException(e);
@@ -280,6 +279,25 @@ public Object apply(ContainerRequest containerRequest, Parameter parameter) {
             return entity;
         }
 
+        private GenericType genericType(Type rawType, Type genericType) {
+            return new GenericType(new ParameterizedType() {
+                @Override
+                public Type[] getActualTypeArguments() {
+                    return new Type[]{genericType};
+                }
+
+                @Override
+                public Type getRawType() {
+                    return rawType;
+                }
+
+                @Override
+                public Type getOwnerType() {
+                    return null;
+                }
+            });
+        }
+
         private static class WrappingFormParamParameter extends Parameter {
             protected WrappingFormParamParameter(Parameter entityPartDataParam, Parameter realDataParam) {
                 super(realDataParam.getAnnotations(),

core-common/src/main/java/org/glassfish/jersey/innate/multipart/package-info.java

@@ -17,7 +17,6 @@
 package org.glassfish.jersey.media.multipart;
 
 import java.io.InputStream;
-import java.lang.reflect.Type;
 import java.text.ParseException;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -27,7 +26,6 @@
 import jakarta.ws.rs.core.GenericType;
 import jakarta.ws.rs.core.MediaType;
 
-import org.glassfish.jersey.innate.multipart.JerseyEntityPart;
 import org.glassfish.jersey.media.multipart.internal.LocalizationMessages;
 import org.glassfish.jersey.message.internal.MediaTypes;
 
@@ -66,7 +64,7 @@
  * @author Paul Sandoz
  * @author Michal Gajdos
  */
-public class FormDataBodyPart extends BodyPart implements JerseyEntityPart, EntityPart {
+public class FormDataBodyPart extends BodyPart implements EntityPart {
 
     private final boolean fileNameFix;
     protected final AtomicBoolean contentRead = new AtomicBoolean(false);
@@ -267,15 +265,6 @@ public <T> T getContent(GenericType<T> type) {
         return type.getRawType().isInstance(entity) ? (T) entity : getEntityAs(type);
     }
 
-    @Override
-    public <T> T getContent(Class<T> type, Type genericType) {
-        if (contentRead.compareAndExchange(false, true)) {
-            throw new IllegalStateException(LocalizationMessages.CONTENT_HAS_BEEN_ALREADY_READ());
-        }
-        final Object entity = getEntity();
-        return type.isInstance(entity) ? (T) entity : getEntityAs(type, genericType);
-    }
-
     /**
      * Sets the control name.
      *