You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2020/01/27 15:55:19 UTC
[aries-jax-rs-whiteboard] 01/02: [ARIES-1931] Remove defaultweb
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit c9c00e0eb7d886ecfa6814934de8686f096266f2
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Mon Jan 27 16:43:39 2020 +0100
[ARIES-1931] Remove defaultweb
---
jax-rs.itests/src/main/java/test/JaxrsTest.java | 107 ---------------------
.../jax/rs/whiteboard/internal/DefaultWeb.java | 105 --------------------
.../jax/rs/whiteboard/internal/Whiteboard.java | 20 +---
3 files changed, 1 insertion(+), 231 deletions(-)
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index 288e3be..121f406 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -1431,113 +1431,6 @@ public class JaxrsTest extends TestHelper {
}
@Test
- public void testDefaultWeb() throws
- IOException, InterruptedException, InvalidSyntaxException {
-
- WebTarget defaultTarget = createDefaultTarget();
-
- assertFalse(
- defaultTarget.request().get(String.class).
- contains("No services have been found"));
-
- ConfigurationAdmin configurationAdmin = getConfigurationAdmin();
-
- Configuration configuration = configurationAdmin.getConfiguration(
- "org.apache.aries.jax.rs.whiteboard.default", "?");
-
- try {
- Hashtable<String, Object> properties = new Hashtable<>();
-
- properties.put("default.web", "false");
-
- CountDownLatch countDownLatch = new CountDownLatch(6);
-
- ServiceTracker<?, ?> tracker =
- new ServiceTracker<>(
- bundleContext,
- JaxrsServiceRuntime.class,
- new ServiceTrackerCustomizer<JaxrsServiceRuntime, Object>() {
- @Override
- public Object addingService(
- ServiceReference<JaxrsServiceRuntime> reference) {
-
- return reference;
- }
-
- @Override
- public void modifiedService(
- ServiceReference<JaxrsServiceRuntime> reference,
- Object service) {
-
- countDownLatch.countDown();
- }
-
- @Override
- public void removedService(
- ServiceReference<JaxrsServiceRuntime> reference,
- Object service) {
-
- }
- });
-
- tracker.open();
-
- configuration.update(properties);
-
- countDownLatch.await(1, TimeUnit.MINUTES);
-
- tracker.close();
-
- assertTrue(
- defaultTarget.request().get(String.class).
- contains("No services have been found"));
- }
- finally {
- CountDownLatch countDownLatch = new CountDownLatch(6);
-
- ServiceTracker<?, ?> tracker =
- new ServiceTracker<>(
- bundleContext,
- JaxrsServiceRuntime.class,
- new ServiceTrackerCustomizer<JaxrsServiceRuntime, Object>() {
- @Override
- public Object addingService(
- ServiceReference<JaxrsServiceRuntime> reference) {
-
- return reference;
- }
-
- @Override
- public void modifiedService(
- ServiceReference<JaxrsServiceRuntime> reference,
- Object service) {
-
- countDownLatch.countDown();
- }
-
- @Override
- public void removedService(
- ServiceReference<JaxrsServiceRuntime> reference,
- Object service) {
-
- }
- });
-
- tracker.open();
-
- configuration.delete();
-
- countDownLatch.await(1, TimeUnit.MINUTES);
-
- tracker.close();
- }
-
- assertFalse(
- defaultTarget.request().get(String.class).
- contains("No services have been found"));
- }
-
- @Test
@Ignore("Asynchronous problems")
public void testDefaultApplicationPath() throws
IOException, InterruptedException, InvalidSyntaxException {
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/DefaultWeb.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/DefaultWeb.java
deleted file mode 100644
index 711ee90..0000000
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/DefaultWeb.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.aries.jax.rs.whiteboard.internal;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-
-@Path("/")
-public class DefaultWeb {
-
- @GET
- @Produces(MediaType.TEXT_HTML)
- public Response home(){
- CacheControl cc = new CacheControl();
- cc.setMaxAge(86400);
- cc.setPrivate(true);
-
- ResponseBuilder builder = Response.ok(
- getClass().getResourceAsStream("/static/index.html"));
- builder.cacheControl(cc);
-
- return builder.build();
- }
-
- @GET
- @Path("/css")
- @Produces("text/css")
- public Response css() {
- CacheControl cc = new CacheControl();
- cc.setMaxAge(86400);
- cc.setPrivate(true);
-
- ResponseBuilder builder = Response.ok(
- getClass().getResourceAsStream("/static/style.css"));
- builder.cacheControl(cc);
-
- return builder.build();
- }
-
- @GET
- @Path("/github")
- @Produces("text/css")
- public Response github() {
- CacheControl cc = new CacheControl();
- cc.setMaxAge(86400);
- cc.setPrivate(true);
-
- ResponseBuilder builder = Response.ok(
- getClass().getResourceAsStream("/static/highlight/styles/github.css"));
- builder.cacheControl(cc);
-
- return builder.build();
- }
-
- @GET
- @Path("/highlight")
- @Produces("text/javascript")
- public Response highlight() {
- CacheControl cc = new CacheControl();
- cc.setMaxAge(86400);
- cc.setPrivate(true);
-
- ResponseBuilder builder = Response.ok(
- getClass().getResourceAsStream("/static/highlight/highlight.pack.js"));
- builder.cacheControl(cc);
-
- return builder.build();
- }
-
- @GET
- @Path("/logo")
- @Produces("image/gif")
- public Response logo() {
- CacheControl cc = new CacheControl();
- cc.setMaxAge(86400);
- cc.setPrivate(true);
-
- ResponseBuilder builder = Response.ok(
- getClass().getResourceAsStream("/static/Arieslogo_Horizontal.gif"));
- builder.cacheControl(cc);
-
- return builder.build();
- }
-
-}
\ No newline at end of file
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index f892ab3..2621e51 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -745,25 +745,7 @@ public class Whiteboard {
registerDefaultApplication() {
return OSGi.register(
- Application.class,
- () -> new DefaultApplication() {
-
- @Override
- public Set<Object> getSingletons() {
- Object defaultApplication = _configurationMap.get(
- "default.web");
-
- if (defaultApplication == null ||
- Boolean.parseBoolean(defaultApplication.toString())) {
-
- return Collections.singleton(new DefaultWeb());
- }
- else {
- return Collections.emptySet();
- }
- }
-
- },
+ Application.class, DefaultApplication::new,
() -> {
Object defaultApplicationBase = _configurationMap.get(
"default.application.base");