This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit f58f929245bbf60cc58f51296d7f1f33b7c42e66 Author: Luca Burgazzoli <lburgazz...@gmail.com> AuthorDate: Tue Nov 10 09:50:37 2020 +0100 Remove initial properties method from Runtime --- .../src/main/java/org/apache/camel/k/Runtime.java | 34 ---------------------- .../apache/camel/k/support/DelegatingRuntime.java | 26 ----------------- .../org/apache/camel/k/quarkus/Application.java | 5 ---- 3 files changed, 65 deletions(-) diff --git a/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java b/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java index b194804..f22e475 100644 --- a/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java +++ b/camel-k-core/api/src/main/java/org/apache/camel/k/Runtime.java @@ -16,12 +16,9 @@ */ package org.apache.camel.k; -import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import java.util.stream.Collectors; import org.apache.camel.CamelContext; import org.apache.camel.Ordered; @@ -45,23 +42,6 @@ public interface Runtime extends HasCamelContext, AutoCloseable { return getCamelContext().getRegistry(); } - default void setInitialProperties(Properties properties) { - getCamelContext().getPropertiesComponent().setInitialProperties(properties); - } - - default void setInitialProperties(Map<String, String> properties) { - Properties p = new Properties(); - p.putAll(properties); - - setInitialProperties(p); - } - - default void setInitialProperties(String key, String value, String... keyVals) { - setInitialProperties( - mapOf(HashMap::new, key, value, keyVals) - ); - } - default void setProperties(Properties properties) { getCamelContext().getPropertiesComponent().setOverrideProperties(properties); } @@ -87,20 +67,6 @@ public interface Runtime extends HasCamelContext, AutoCloseable { } } - default void setPropertiesLocations(Collection<String> locations) { - getCamelContext().getPropertiesComponent().setLocation( - locations.stream() - .map(location -> location.startsWith("file:") ? location : "file:" + location) - .distinct() - .sorted() - .collect(Collectors.joining(",")) - ); - } - - default void setPropertiesLocations(String... locations) { - setPropertiesLocations(Arrays.asList(locations)); - } - /** * Lifecycle method used to stops the entire integration. */ diff --git a/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java b/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java index 9cce10f..c853d77 100644 --- a/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java +++ b/camel-k-core/support/src/main/java/org/apache/camel/k/support/DelegatingRuntime.java @@ -16,7 +16,6 @@ */ package org.apache.camel.k.support; -import java.util.Collection; import java.util.Map; import java.util.Properties; @@ -43,21 +42,6 @@ public class DelegatingRuntime implements Runtime { } @Override - public void setInitialProperties(Properties properties) { - runtime.setInitialProperties(properties); - } - - @Override - public void setInitialProperties(Map<String, String> properties) { - runtime.setInitialProperties(properties); - } - - @Override - public void setInitialProperties(String key, String value, String... keyVals) { - runtime.setInitialProperties(key, value, keyVals); - } - - @Override public void setProperties(Properties properties) { runtime.setProperties(properties); } @@ -78,16 +62,6 @@ public class DelegatingRuntime implements Runtime { } @Override - public void setPropertiesLocations(Collection<String> locations) { - runtime.setPropertiesLocations(locations); - } - - @Override - public void setPropertiesLocations(String... locations) { - runtime.setPropertiesLocations(locations); - } - - @Override public void stop() throws Exception { runtime.stop(); } diff --git a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java index 91c89b8..50da099 100644 --- a/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java +++ b/camel-k-runtime/runtime/src/main/java/org/apache/camel/k/quarkus/Application.java @@ -64,11 +64,6 @@ public final class Application { } @Override - public void setInitialProperties(Properties properties) { - main.setInitialProperties(properties); - } - - @Override public void setProperties(Properties properties) { main.setOverrideProperties(properties); }