Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.15.x] backports in waiting for camel 4.8.1 #6661

Draft
wants to merge 2 commits into
base: 3.15.x
Choose a base branch
from
Draft

[3.15.x] backports in waiting for camel 4.8.1 #6661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa1c7aa
Remove Capability capability
JiriOndrusek Oct 3, 2024
e03eb3a
Remove Capability capability from catalog
JiriOndrusek Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions catalog/src/main/java/org/apache/camel/catalog/quarkus/QuarkusRuntimeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
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.CamelCatalog;
import org.apache.camel.catalog.RuntimeProvider;
Expand All @@ -42,7 +39,6 @@ public class QuarkusRuntimeProvider implements RuntimeProvider {
private static final String TRANSFORMER_DIR = "org/apache/camel/catalog/quarkus/transformers";
private static final String OTHER_DIR = "org/apache/camel/catalog/quarkus/others";
private static final String BEANS_DIR = "org/apache/camel/catalog/quarkus/beans";
private static final String CAPABILITIES_CATALOG = "org/apache/camel/catalog/quarkus/capabilities.properties";
private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/quarkus/components.properties";
private static final String DEV_CONSOLE_CATALOG = "org/apache/camel/catalog/quarkus/dev-consoles.properties";
private static final String DATA_FORMATS_CATALOG = "org/apache/camel/catalog/quarkus/dataformats.properties";
Expand Down Expand Up @@ -210,16 +206,4 @@ public List<String> findBeansNames() {
}
return names;
}

@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public Map<String, String> findCapabilities() {
final Properties properties = new Properties();
try (InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(CAPABILITIES_CATALOG)) {
properties.load(is);
} catch (IOException e) {
// ignore
}
return new TreeMap<>((Map<String, String>) (Map) properties);
}
}
23 changes: 0 additions & 23 deletions tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -350,7 +347,6 @@ static class CqRuntimeProvider implements RuntimeProvider {
private static final String TRANSFORMER_CATALOG = CQ_CATALOG_DIR + "/transformers.properties";
private static final String OTHER_CATALOG = CQ_CATALOG_DIR + "/others.properties";
private static final String BEANS_CATALOG = CQ_CATALOG_DIR + "/beans.properties";
private static final String CAPABILITIES_CATALOG = "org/apache/camel/catalog/capabilities.properties";

private CamelCatalog camelCatalog;

Expand Down Expand Up @@ -446,10 +442,6 @@ protected String getBeansCatalog() {
return BEANS_CATALOG;
}

protected String getCapabilitiesCatalog() {
return CAPABILITIES_CATALOG;
}

@Override
public List<String> findComponentNames() {
List<String> names = new ArrayList<>();
Expand Down Expand Up @@ -548,21 +540,6 @@ public List<String> findBeansNames() {
return names;
}

@Override
public Map<String, String> findCapabilities() {
final Properties properties = new Properties();

InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(getCapabilitiesCatalog());
if (is != null) {
try {
properties.load(is);
} catch (IOException e) {
// ignore
}
}

return new TreeMap<>((Map<String, String>) (Map) properties);
}
}

public static class GavCqCatalog extends CqCatalog implements AutoCloseable {
Expand Down
Loading