This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.8.x by this push:
new 081756164a3 Remove Capability capability (#16006)
081756164a3 is described below
commit 081756164a376a201f537322734d1122bb2a28a6
Author: JiriOndrusek <[email protected]>
AuthorDate: Sat Oct 19 08:39:58 2024 +0200
Remove Capability capability (#16006)
Co-authored-by: Croway <[email protected]>
---
.../org/apache/camel/catalog/CamelCatalog.java | 11 -----
.../apache/camel/catalog/DefaultCamelCatalog.java | 25 ----------
.../camel/catalog/DefaultRuntimeProvider.java | 22 ---------
.../org/apache/camel/catalog/RuntimeProvider.java | 6 ---
.../org/apache/camel/catalog/CamelCatalogTest.java | 16 -------
.../camel/dsl/jbang/core/commands/k/Agent.java | 27 -----------
.../camel/dsl/jbang/core/commands/k/AgentTest.java | 53 ----------------------
.../org/apache/camel/tooling/model/EntityRef.java | 23 ----------
8 files changed, 183 deletions(-)
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
index 56542990fa5..0d35247d522 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -20,7 +20,6 @@ import java.io.InputStream;
import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import org.apache.camel.tooling.model.ArtifactModel;
@@ -30,7 +29,6 @@ import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.DataFormatModel;
import org.apache.camel.tooling.model.DevConsoleModel;
import org.apache.camel.tooling.model.EipModel;
-import org.apache.camel.tooling.model.EntityRef;
import org.apache.camel.tooling.model.Kind;
import org.apache.camel.tooling.model.LanguageModel;
import org.apache.camel.tooling.model.MainModel;
@@ -224,11 +222,6 @@ public interface CamelCatalog {
*/
List<String> findBeansNames();
- /**
- * Find all the capability names from the Camel catalog
- */
- List<String> findCapabilityNames();
-
/**
* @param kind the kind to look for
* @return the list of part names of the given {@link Kind} available
in this {@link CamelCatalog}
@@ -645,8 +638,4 @@ public interface CamelCatalog {
*/
List<ReleaseModel> camelQuarkusReleases();
- /**
- * Find the entity the given capability maps to.
- */
- Optional<EntityRef> findCapabilityRef(String capability);
}
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index f5ee38d6030..5a2c6180a77 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -41,9 +40,7 @@ import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.DataFormatModel;
import org.apache.camel.tooling.model.DevConsoleModel;
import org.apache.camel.tooling.model.EipModel;
-import org.apache.camel.tooling.model.EntityRef;
import org.apache.camel.tooling.model.JsonMapper;
-import org.apache.camel.tooling.model.Kind;
import org.apache.camel.tooling.model.LanguageModel;
import org.apache.camel.tooling.model.MainModel;
import org.apache.camel.tooling.model.OtherModel;
@@ -312,11 +309,6 @@ public class DefaultCamelCatalog extends
AbstractCachingCamelCatalog implements
return findNames(filter, this::findOtherNames, this::otherModel);
}
- @Override
- public List<String> findCapabilityNames() {
- return List.copyOf(runtimeProvider.findCapabilities().keySet());
- }
-
private List<String> findNames(
String filter, Supplier<List<String>> findNames, Function<String,
? extends BaseModel<?>> modelLoader) {
List<String> answer = new ArrayList<>();
@@ -645,23 +637,6 @@ public class DefaultCamelCatalog extends
AbstractCachingCamelCatalog implements
return camelReleases("camel-quarkus-releases.json");
}
- @Override
- public Optional<EntityRef> findCapabilityRef(String capability) {
- Map<String, String> capabilities = cache("capabilities",
runtimeProvider::findCapabilities);
-
- String ref = capabilities.get(capability);
- if (ref == null) {
- return Optional.empty();
- }
-
- String[] items = ref.split("/");
- if (items.length != 2) {
- return Optional.empty();
- }
-
- return Optional.of(new EntityRef(Kind.valueOf(items[0]), items[1]));
- }
-
private List<ReleaseModel> camelReleases(String file) {
return cache(file, () -> {
try {
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
index f80763ce3b2..45e41204394 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultRuntimeProvider.java
@@ -20,9 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
import org.apache.camel.catalog.impl.CatalogHelper;
@@ -41,7 +38,6 @@ public class DefaultRuntimeProvider implements
RuntimeProvider {
private static final String TRANSFORMER_CATALOG =
"org/apache/camel/catalog/transformers.properties";
private static final String CONSOLE_CATALOG =
"org/apache/camel/catalog/dev-consoles.properties";
private static final String OTHER_CATALOG =
"org/apache/camel/catalog/others.properties";
- private static final String CAPABILITIES_CATALOG =
"org/apache/camel/catalog/capabilities.properties";
private static final String BEANS_CATALOG =
"org/apache/camel/catalog/beans.properties";
private CamelCatalog camelCatalog;
@@ -137,10 +133,6 @@ public class DefaultRuntimeProvider implements
RuntimeProvider {
return OTHER_CATALOG;
}
- protected String getCapabilitiesCatalog() {
- return CAPABILITIES_CATALOG;
- }
-
protected String getBeansCatalog() {
return BEANS_CATALOG;
}
@@ -180,20 +172,6 @@ public class DefaultRuntimeProvider implements
RuntimeProvider {
return find(getBeansCatalog());
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Override
- public Map<String, String> findCapabilities() {
- final Properties properties = new Properties();
-
- try (InputStream is =
getCamelCatalog().getVersionManager().getResourceAsStream(getCapabilitiesCatalog()))
{
- properties.load(is);
- } catch (IOException e) {
- // ignore
- }
-
- return new TreeMap<>((Map<String, String>) (Map) properties);
- }
-
protected List<String> find(String resourceName) {
List<String> names = new ArrayList<>();
try (InputStream is =
getCamelCatalog().getVersionManager().getResourceAsStream(resourceName)) {
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/RuntimeProvider.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/RuntimeProvider.java
index 5d65d45207c..a67321c080b 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/RuntimeProvider.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/RuntimeProvider.java
@@ -17,7 +17,6 @@
package org.apache.camel.catalog;
import java.util.List;
-import java.util.Map;
/**
* A pluggable strategy for chosen runtime to run Camel such as default,
karaf, spring-boot, etc. This allows third
@@ -121,9 +120,4 @@ public interface RuntimeProvider {
*/
List<String> findBeansNames();
- /**
- * Find all the capabilities from the Camel catalog supported by the
provider
- */
- Map<String, String> findCapabilities();
-
}
diff --git
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 9ee36b3f32f..93231c8c3ca 100644
---
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.stream.Stream;
import com.fasterxml.jackson.databind.JsonNode;
@@ -32,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.tooling.model.ArtifactModel;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.DataFormatModel;
-import org.apache.camel.tooling.model.EntityRef;
import org.apache.camel.tooling.model.Kind;
import org.apache.camel.tooling.model.LanguageModel;
import org.apache.camel.tooling.model.PojoBeanModel;
@@ -1602,20 +1600,6 @@ public class CamelCatalogTest {
Assertions.assertEquals("11", rel.getJdk());
}
- @Test
- public void capabilities() {
- List<String> list = catalog.findCapabilityNames();
- Assertions.assertEquals(1, list.size());
-
- Optional<EntityRef> ref = catalog.findCapabilityRef("platform-http");
- Assertions.assertTrue(ref.isPresent());
- Assertions.assertEquals(Kind.other, ref.get().kind());
- Assertions.assertEquals("platform-http-main", ref.get().name());
-
- Optional<EntityRef> ref2 =
catalog.findCapabilityRef("not-implemented");
- Assertions.assertFalse(ref2.isPresent());
- }
-
@Test
public void testFindPojoBeanNames() {
List<String> names = catalog.findBeansNames();
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java
b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java
index 836cb720366..ca521df2baa 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/Agent.java
@@ -18,7 +18,6 @@ package org.apache.camel.dsl.jbang.core.commands.k;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.CountDownLatch;
@@ -41,7 +40,6 @@ import
org.apache.camel.dsl.jbang.core.common.RuntimeCompletionCandidates;
import org.apache.camel.dsl.jbang.core.common.RuntimeType;
import org.apache.camel.dsl.jbang.core.common.RuntimeTypeConverter;
import org.apache.camel.tooling.model.BaseModel;
-import org.apache.camel.tooling.model.EntityRef;
import org.apache.camel.tooling.model.Kind;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -128,10 +126,6 @@ public class Agent extends CamelCommand {
.produces(MIME_TYPE_JSON)
.blockingHandler(this::handleCatalogModel);
- router.route(HttpMethod.GET, "/catalog/capability/:name")
- .produces(MIME_TYPE_JSON)
- .blockingHandler(this::handleCatalogCapability);
-
router.route(HttpMethod.POST, "/inspect/:location")
.produces(MIME_TYPE_JSON)
.blockingHandler(this::handleInspect);
@@ -151,27 +145,6 @@ public class Agent extends CamelCommand {
.end();
}
- private void handleCatalogCapability(RoutingContext ctx) {
- try {
- final CamelCatalog catalog =
CatalogHelper.loadCatalog(runtimeType, runtimeVersion, repos, quarkusGroupId);
- final String name = ctx.pathParam("name");
- final Optional<EntityRef> ref = catalog.findCapabilityRef(name);
-
- if (ref.isPresent()) {
- ctx.response()
- .putHeader(CONTENT_TYPE_HEADER, MIME_TYPE_JSON)
-
.end(MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(ref.get()));
- } else {
- ctx.response()
- .setStatusCode(204)
- .putHeader(CONTENT_TYPE_HEADER, MIME_TYPE_JSON)
-
.end(MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(Map.of()));
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
private void handleCatalogModel(RoutingContext ctx) {
try {
final CamelCatalog catalog =
CatalogHelper.loadCatalog(runtimeType, runtimeVersion, repos, quarkusGroupId);
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/AgentTest.java
b/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/AgentTest.java
index 1dd20ce50a1..56612497224 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/AgentTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/AgentTest.java
@@ -33,7 +33,6 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.is;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class AgentTest {
@@ -103,58 +102,6 @@ class AgentTest {
}
}
- @ParameterizedTest
- @CsvSource({ "platform-http,200", "baz,204" })
- public void testCapability(String name, int code) throws Exception {
- Agent agent = cmd();
- agent.port = 0;
-
- Vertx vertx = Vertx.vertx();
- HttpServer server = agent.serve(vertx).toCompletableFuture().get();
-
- try {
- int port = server.actualPort();
- RestAssured.given()
- .baseUri("http://localhost";)
- .port(port)
- .when()
- .get("/catalog/capability/" + name)
- .then()
- .statusCode(code);
-
- } finally {
- server.close();
- vertx.close();
- }
- }
-
- @ParameterizedTest
- @CsvSource({ "platform-http,other,platform-http-main" })
- public void testCapabilities(String name, String expectedKind, String
expectedName) throws Exception {
- Agent agent = cmd();
- agent.port = 0;
-
- Vertx vertx = Vertx.vertx();
- HttpServer server = agent.serve(vertx).toCompletableFuture().get();
-
- try {
- int port = server.actualPort();
- RestAssured.given()
- .baseUri("http://localhost";)
- .port(port)
- .when()
- .get("/catalog/capability/" + name)
- .then()
- .statusCode(200)
- .body("kind", is(expectedKind))
- .body("name", is(expectedName));
-
- } finally {
- server.close();
- vertx.close();
- }
- }
-
@Disabled
@Test
public void testCall() throws Exception {
diff --git
a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/EntityRef.java
b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/EntityRef.java
deleted file mode 100644
index ff7f5def40d..00000000000
---
a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/EntityRef.java
+++ /dev/null
@@ -1,23 +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.camel.tooling.model;
-
-/**
- * Reference a Camel entity.
- */
-public record EntityRef(Kind kind, String name) {
-}
