This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7d0dc0bb365347da5d4358b7bfa3d03b280a583c Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Thu May 16 22:35:30 2019 +0200 CAMEL-13528 - fix remaining textual references to spoolChiper --- docs/user-manual/modules/ROOT/pages/stream-caching.adoc | 4 ++-- .../org/apache/camel/commands/AbstractLocalCamelController.java | 2 +- .../src/main/java/org/apache/camel/commands/ContextInfoCommand.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc index 39dd7e4..9cc3bee 100644 --- a/docs/user-manual/modules/ROOT/pages/stream-caching.adoc +++ b/docs/user-manual/modules/ROOT/pages/stream-caching.adoc @@ -208,7 +208,7 @@ The strategy has the following options: | spoolDirectory | ${java.io.tmpdir}/camel/camel-tmp-\#uuid# | Base directory where temporary files for spooled streams should be stored. This option supports naming patterns as documented below. -| spoolChiper | null +| spoolCipher | null | If set, the temporary files are encrypted using the specified cipher transformation (i.e., a valid stream or 8-bit cipher name such as "RC4", "AES/CTR/NoPadding". An empty name "" is treated as null). | spoolThreshold | 128 KB @@ -275,7 +275,7 @@ context.getStreamCachingStrategy().setSpoolDirectory"/tmp/cachedir"); context.getStreamCachingStrategy().setSpoolThreshold(64 * 1024); context.getStreamCachingStrategy().setBufferSize(16 * 1024); // to enable encryption using RC4 -// context.getStreamCachingStrategy().setSpoolChiper("RC4"); +// context.getStreamCachingStrategy().setSpoolCipher("RC4"); ---- And remember to enable Stream caching on the CamelContext or on routes: diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java index cadb52b..69050fa 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java @@ -132,7 +132,7 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll if (context.getStreamCachingStrategy().isEnabled()) { answer.put("streamCachingEnabled", true); answer.put("streamCaching.spoolDirectory", context.getStreamCachingStrategy().getSpoolDirectory()); - answer.put("streamCaching.spoolChiper", context.getStreamCachingStrategy().getSpoolCipher()); + answer.put("streamCaching.spoolCipher", context.getStreamCachingStrategy().getSpoolCipher()); answer.put("streamCaching.spoolThreshold", context.getStreamCachingStrategy().getSpoolThreshold()); answer.put("streamCaching.spoolUsedHeapMemoryThreshold", context.getStreamCachingStrategy().getSpoolUsedHeapMemoryThreshold()); answer.put("streamCaching.spoolUsedHeapMemoryLimit", context.getStreamCachingStrategy().getSpoolUsedHeapMemoryLimit()); diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java index a96dc7f..0666e03 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/ContextInfoCommand.java @@ -137,7 +137,7 @@ public class ContextInfoCommand extends AbstractContextCommand { enabled = (boolean) row.get("streamCachingEnabled"); if (enabled) { Object spoolDirectory = safeNull(row.get("streamCaching.spoolDirectory")); - Object spoolChiper = safeNull(row.get("streamCaching.spoolChiper")); + Object spoolCipher = safeNull(row.get("streamCaching.spoolCipher")); Object spoolThreshold = safeNull(row.get("streamCaching.spoolThreshold")); Object spoolUsedHeapMemoryThreshold = safeNull(row.get("streamCaching.spoolUsedHeapMemoryThreshold")); Object spoolUsedHeapMemoryLimit = safeNull(row.get("streamCaching.spoolUsedHeapMemoryLimit")); @@ -146,9 +146,9 @@ public class ContextInfoCommand extends AbstractContextCommand { Object removeSpoolDirectoryWhenStopping = safeNull(row.get("streamCaching.removeSpoolDirectoryWhenStopping")); boolean statisticsEnabled = (boolean) row.get("streamCaching.statisticsEnabled"); - String text = String.format("\tStream caching: [spoolDirectory=%s, spoolChiper=%s, spoolThreshold=%s, spoolUsedHeapMemoryThreshold=%s, " + String text = String.format("\tStream caching: [spoolDirectory=%s, spoolCipher=%s, spoolThreshold=%s, spoolUsedHeapMemoryThreshold=%s, " + "spoolUsedHeapMemoryLimit=%s, anySpoolRules=%s, bufferSize=%s, removeSpoolDirectoryWhenStopping=%s, statisticsEnabled=%s]", - spoolDirectory, spoolChiper, spoolThreshold, spoolUsedHeapMemoryThreshold, spoolUsedHeapMemoryLimit, anySpoolRules, bufferSize, + spoolDirectory, spoolCipher, spoolThreshold, spoolUsedHeapMemoryThreshold, spoolUsedHeapMemoryLimit, anySpoolRules, bufferSize, removeSpoolDirectoryWhenStopping, statisticsEnabled); out.println(stringEscape.unescapeJava(text));