Merge branch 'master' into bugfix/fix-http-repo-headers-config

Author: Skejven

Diff for: documentation/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-root</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>documentation</artifactId>

Diff for: knotx-adapter/knotx-adapter-common/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-adapter</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>knotx-adapter-common</artifactId>

Diff for: knotx-adapter/knotx-adapter-service-http/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-adapter</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>knotx-adapter-service-http</artifactId>

Diff for: knotx-adapter/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-root</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>knotx-adapter</artifactId>

Diff for: knotx-core/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-root</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>knotx-core</artifactId>

Diff for: knotx-core/src/test/java/io/knotx/assembler/UnprocessedFragmentStrategyTest.java

@@ -20,7 +20,7 @@
 
 import io.knotx.dataobjects.Fragment;
 import io.knotx.fragments.SnippetPatterns;
-import io.knotx.junit5.KnotxArgumentConverter;
+import io.knotx.junit.converter.FragmentArgumentConverter;
 import io.knotx.junit5.util.FileReader;
 import io.knotx.options.SnippetOptions;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -37,7 +37,7 @@ public class UnprocessedFragmentStrategyTest {
       "io/knotx/assembler/customTagAndParamsPrefix_snippet.txt;io/knotx/assembler/customTagAndParamsPrefix_snippet.txt;knotx:snippet;"
   })
   public void asIs_whenConfiguredSnippetTag_expectIgnoredContent(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment,
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment,
       String expectedContentFileName, String snippetTagName, String paramsPrefix) throws Exception {
     final String unwrappedContent = UnprocessedFragmentStrategy.AS_IS
         .get(fragment, new SnippetPatterns(buildOptions(snippetTagName, paramsPrefix)));
@@ -54,7 +54,7 @@ public void asIs_whenConfiguredSnippetTag_expectIgnoredContent(
       "io/knotx/assembler/customTagAndParamsPrefix_snippet.txt|knotx:snippet|;io/knotx/assembler/simple_snippet-expected_unwrapped_content.txt;knotx:snippet;"
   })
   public void unwrap_whenConfiguredSnippetTag_expectDefinedContentWithComments(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment,
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment,
       String expectedContentFileName, String snippetTagName, String paramsPrefix) throws Exception {
     final String unwrappedContent = UnprocessedFragmentStrategy.UNWRAP
         .get(fragment, new SnippetPatterns(buildOptions(snippetTagName, paramsPrefix)));
@@ -71,7 +71,7 @@ public void unwrap_whenConfiguredSnippetTag_expectDefinedContentWithComments(
       //when fragment is a raw fragment, it is not ignored
   })
   public void ignore_whenConfiguredSnippetTag_expectIgnoredContent(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment,
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment,
       String expectedContentFileName, String snippetTagName, String paramsPrefix) throws Exception {
     final String unwrappedContent = UnprocessedFragmentStrategy.IGNORE
         .get(fragment, new SnippetPatterns(buildOptions(snippetTagName, paramsPrefix)));

Diff for: knotx-core/src/test/java/io/knotx/fragments/FragmentContentExtractorTest.java

@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import io.knotx.dataobjects.Fragment;
-import io.knotx.junit5.KnotxArgumentConverter;
+import io.knotx.junit.converter.FragmentArgumentConverter;
 import java.io.IOException;
 import org.jsoup.nodes.Element;
 import org.junit.jupiter.api.Test;
@@ -42,7 +42,7 @@ public class FragmentContentExtractorTest {
       "io/knotx/fragments/complex_custom_snippet.txt|knotx:snippet;io/knotx/fragments/complex_snippet-expected_content.txt"
   })
   public void unwrappedContent_withFragment_expectDefinedContent(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment,
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment,
       String expectedContentFileName) throws Exception {
     final String expectedContent = readText(expectedContentFileName);
     final String unwrappedContent = FragmentContentExtractor.unwrapContent(fragment);
@@ -74,7 +74,7 @@ public void unwrappedContent_withString_expectDefinedContent(
       "io/knotx/fragments/complex_custom_snippet.txt;io/knotx/fragments/complex_snippet-expected_content.txt"
   })
   public void unwrapFragmentContent_withFragment_expectDefinedContent(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment,
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment,
       String expectedContentFileName) throws Exception {
 
     final String expectedContent = readText(expectedContentFileName);
@@ -89,7 +89,7 @@ public void unwrapFragmentContent_withFragment_expectDefinedContent(
       "io/knotx/fragments/raw_snippet.txt"
   })
   public void getUnwrappedContent_withRawFragment_expectNotChangedContent(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment) throws Exception {
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment) throws Exception {
     final String unwrappedContent = FragmentContentExtractor.unwrapContent(fragment);
 
     assertThat(unwrappedContent, equalToIgnoringWhiteSpace(fragment.content()));

Diff for: knotx-core/src/test/java/io/knotx/junit/coercers/KnotxCoercers.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2016 Cognifide Limited
+ *
+ * Licensed 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 io.knotx.junit.converter;
+
+import static org.mockito.Mockito.when;
+
+import io.knotx.dataobjects.Fragment;
+import io.knotx.fragments.SnippetPatterns;
+import io.knotx.junit5.util.FileReader;
+import io.knotx.options.SnippetOptions;
+import java.io.IOException;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.converter.ArgumentConversionException;
+import org.junit.jupiter.params.converter.SimpleArgumentConverter;
+import org.mockito.Mockito;
+
+/**
+ * Simplifies argument type conversion for parameterized tests (these annotated with {@linkplain
+ * ParameterizedTest})
+ */
+public class FragmentArgumentConverter extends SimpleArgumentConverter {
+
+  private static final String DEFAULT_SNIPPET_TAG_NAME = "script";
+  private static final String DEFAULT_SNIPPET_PARAM_PREFIX = "data-knotx-";
+  private static final String PARAMETER_SEPARATOR_REGEX = "\\|";
+  private static final String PARAMETER_SEPARATOR = "|";
+
+  @Override
+  protected Object convert(Object source, Class<?> targetType) throws ArgumentConversionException {
+    if (!String.class.equals(source.getClass())) {
+      throw new ArgumentConversionException("This converter supports only String as source object");
+    }
+
+    String toConvert = String.valueOf(source);
+
+    if (targetType.equals(Fragment.class)) {
+      try {
+        return createFragmentMock(toConvert);
+      } catch (IOException e) {
+        throw new ArgumentConversionException("Exception thrown during conversion", e);
+      }
+    }
+
+    throw new ArgumentConversionException(
+        "Unsupported object type for conversion: " + targetType.toString());
+  }
+
+  /**
+   * Builds mock of {@link io.knotx.dataobjects.Fragment} from provided fragmentParameters. The only
+   * mandatory value of the fragmentParameters is fragment content file, that will be the fragment
+   * content. There 2 additional params:
+   *
+   * <ul>
+   * <li>custom snippet tag name (default value is <bb>script</bb>)
+   * <li>custom snippet parameters prefix (default value is <bb>data-knotx-</bb>)
+   * </ul>
+   *
+   * You can embed them in the fragmentParameters, separated by <bb>|</bb> character.<br>
+   * <br>
+   * <i>Example:</i> "content.txt|knotx:snippet|data-knotx-" will produce Fragment mock with
+   * content read from content.txt, snippet tag name set to "knotx:snippet" and snippet parameters
+   * prefix set to "data-knotx-". If the last character of fragmentParameters is the separator
+   * <bb>|</bb>, then snippet parameters prefix will be set to empty string (no prefix).
+   */
+  static Fragment createFragmentMock(String fragmentParameters) throws IOException {
+    final String[] params = fragmentParameters.split(PARAMETER_SEPARATOR_REGEX);
+    final String fragmentContentFile = params[0];
+    final String snippetTagName = extractSnippetTagName(params);
+    final String fragmentContent = FileReader.readText(fragmentContentFile);
+    final String snippetParamPrefix = extractSnippetParamPrefix(params, fragmentParameters);
+    final SnippetPatterns patterns =
+        new SnippetPatterns(buildOptions(snippetTagName, snippetParamPrefix));
+
+    Fragment fragmentMock = Mockito.mock(Fragment.class);
+    when(fragmentMock.content()).thenReturn(fragmentContent);
+    when(fragmentMock.isRaw())
+        .thenReturn(!patterns.getAnySnippetPattern().matcher(fragmentContent).matches());
+    return fragmentMock;
+  }
+
+  private static SnippetOptions buildOptions(String snippetTagName, String snippetParamPrefix) {
+    return new SnippetOptions().setTagName(snippetTagName).setParamsPrefix(snippetParamPrefix);
+  }
+
+  private static String extractSnippetTagName(String[] params) {
+    if (params.length > 1) {
+      return params[1];
+    }
+    return DEFAULT_SNIPPET_TAG_NAME;
+  }
+
+  private static String extractSnippetParamPrefix(String[] params, String fragmentParameters) {
+    if (params.length > 2) {
+      return params[2];
+    } else if (StringUtils.endsWith(fragmentParameters, PARAMETER_SEPARATOR)) {
+      return "";
+    }
+    return DEFAULT_SNIPPET_PARAM_PREFIX;
+  }
+}

Diff for: knotx-core/src/test/java/io/knotx/junit/converter/FragmentArgumentConverter.java

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-knot</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>knotx-knot-action</artifactId>

Diff for: knotx-knot/knotx-knot-action/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-knot</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>knotx-knot-handlebars</artifactId>

Diff for: knotx-knot/knotx-knot-handlebars/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.knotx</groupId>
     <artifactId>knotx-knot</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>knotx-knot-service</artifactId>

Diff for: knotx-knot/knotx-knot-service/pom.xml

@@ -20,7 +20,7 @@
 import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
 
 import io.knotx.dataobjects.Fragment;
-import io.knotx.junit5.KnotxArgumentConverter;
+import io.knotx.junit.converter.FragmentArgumentConverter;
 import io.knotx.knot.service.service.ServiceEntry;
 import io.vertx.core.json.JsonObject;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -38,7 +38,7 @@ public class FragmentContextTest {
       "snippet_one_service_many_params-no-prefix.txt;{\"path\":\"/overridden/path\",\"anotherParam\":\"someValue\"}",
   })
   public void from_whenFragmentContainsOneService_expectFragmentContextWithExtractedParamsParams(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment, String expectedParameters) {
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment, String expectedParameters) {
 
     final FragmentContext fragmentContext = FragmentContext.from(fragment);
     final ServiceEntry serviceEntry = fragmentContext.services.get(0);
@@ -56,7 +56,7 @@ public void from_whenFragmentContainsOneService_expectFragmentContextWithExtract
       "snippet_one_service_many_params-no-prefix.txt;1"
   })
   public void from_whenFragmentContainsServices_expectFragmentContextWithProperNumberOfServicesExtracted(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment, int numberOfExpectedServices) {
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment, int numberOfExpectedServices) {
 
     final FragmentContext fragmentContext = FragmentContext.from(fragment);
     assertThat(fragmentContext.services.size(), is(numberOfExpectedServices));
@@ -69,7 +69,7 @@ public void from_whenFragmentContainsServices_expectFragmentContextWithProperNum
       "snippet_four_services_with_params_and_extra_param-no-prefix.txt;{\"a\":{\"a\":\"a\"},\"b\":{\"b\":\"b\"},\"c\":{\"c\":\"c\"},\"d\":{\"d\":\"d\"}}"
   })
   public void from_whenFragmentContainsServices_expectProperlyAssignedParams(
-      @ConvertWith(KnotxArgumentConverter.class) Fragment fragment, JsonObject parameters) {
+      @ConvertWith(FragmentArgumentConverter.class) Fragment fragment, JsonObject parameters) {
 
     final FragmentContext fragmentContext = FragmentContext.from(fragment);
     fragmentContext.services.forEach(serviceEntry ->