You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2018/01/23 12:11:06 UTC
aries-jax-rs-whiteboard git commit: A quick fix to the
AriesJaxRSServiceRuntime to get it building again
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master e123aac77 -> 2889d9fa4
A quick fix to the AriesJaxRSServiceRuntime to get it building again
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/2889d9fa
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/2889d9fa
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/2889d9fa
Branch: refs/heads/master
Commit: 2889d9fa4a5781a6b4498bb689be7bab5da0bdbd
Parents: e123aac
Author: Tim Ward <ti...@apache.org>
Authored: Tue Jan 23 06:25:24 2018 -0500
Committer: Tim Ward <ti...@apache.org>
Committed: Tue Jan 23 06:25:24 2018 -0500
----------------------------------------------------------------------
.../internal/AriesJaxRSServiceRuntime.java | 51 +++++++++++---------
1 file changed, 27 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/2889d9fa/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
index edc8e32..899756d 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
@@ -17,10 +17,31 @@
package org.apache.aries.jax.rs.whiteboard.internal;
+import static org.apache.aries.jax.rs.whiteboard.internal.Utils.canonicalize;
+import static org.apache.aries.jax.rs.whiteboard.internal.Utils.generateApplicationName;
+import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.DEFAULT_NAME;
+import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.SUPPORTED_EXTENSION_INTERFACES;
+import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.getApplicationBase;
+import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_NAME;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
+
+import javax.ws.rs.core.Application;
+
import org.apache.aries.jax.rs.whiteboard.internal.Utils.PropertyHolder;
import org.apache.aries.osgi.functional.CachingServiceReference;
import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime;
import org.osgi.service.jaxrs.runtime.dto.ApplicationDTO;
+import org.osgi.service.jaxrs.runtime.dto.BaseDTO;
+import org.osgi.service.jaxrs.runtime.dto.BaseExtensionDTO;
import org.osgi.service.jaxrs.runtime.dto.DTOConstants;
import org.osgi.service.jaxrs.runtime.dto.ExtensionDTO;
import org.osgi.service.jaxrs.runtime.dto.FailedApplicationDTO;
@@ -32,24 +53,6 @@ import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.core.Application;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.function.BiFunction;
-import java.util.stream.Stream;
-
-import static org.apache.aries.jax.rs.whiteboard.internal.Utils.canonicalize;
-import static org.apache.aries.jax.rs.whiteboard.internal.Utils.generateApplicationName;
-import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.DEFAULT_NAME;
-import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.SUPPORTED_EXTENSION_INTERFACES;
-import static org.apache.aries.jax.rs.whiteboard.internal.Whiteboard.getApplicationBase;
-import static org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants.JAX_RS_NAME;
-
public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
private static final long serialVersionUID = 1L;
@@ -411,8 +414,8 @@ public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
};
}
- private static ExtensionDTO populateExtensionDTO(
- ExtensionDTO extensionDTO, CachingServiceReference<?> serviceReference) {
+ private static <T extends BaseExtensionDTO> T populateExtensionDTO(
+ T extensionDTO, CachingServiceReference<?> serviceReference) {
extensionDTO.name = getApplicationName(serviceReference::getProperty);
extensionDTO.serviceId = (Long)serviceReference.getProperty(
@@ -428,8 +431,8 @@ public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
return extensionDTO;
}
- private static ResourceDTO populateResourceDTO(
- ResourceDTO resourceDTO, CachingServiceReference<?> serviceReference) {
+ private static <T extends BaseDTO> T populateResourceDTO(
+ T resourceDTO, CachingServiceReference<?> serviceReference) {
resourceDTO.name = getApplicationName(serviceReference::getProperty);
resourceDTO.serviceId = (Long)serviceReference.getProperty(
@@ -582,7 +585,7 @@ public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
return
applicationEndpointStream.map(
- sr -> populateResourceDTO(new ResourceDTO(){}, sr)
+ sr -> populateResourceDTO(new ResourceDTO(), sr)
);
}
@@ -597,7 +600,7 @@ public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
return
applicationExtensionStream.map(
- sr -> populateExtensionDTO(new ExtensionDTO(){}, sr)
+ sr -> populateExtensionDTO(new ExtensionDTO(), sr)
);
}