/*
  This file is licensed 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.xmlunit.assertj;

import org.assertj.core.api.AbstractBooleanAssert;
import org.assertj.core.api.AbstractCharSequenceAssert;
import org.assertj.core.api.AbstractDoubleAssert;
import org.assertj.core.api.AbstractIntegerAssert;
import org.assertj.core.api.AbstractObjectArrayAssert;
import org.assertj.core.api.AbstractObjectAssert;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.ObjectAssert;

/**
 * Class that is proxy for {@link org.assertj.core.api.Assertions#assertThat} used by org.xmlunit.assertj.*Assert classes.
 * <p>
 * XMLUnit AssertJ module is compatibility with Java 7, so it use use AssertJ 2.x version.
 * In AssertJ 3.9.1 was introduced binary incompatibility,
 * so using latest AssertJ version may cause {@link java.lang.NoSuchMethodError}.
 * Using AssertionsAdapter allows to provide custom implementation of <i>assertThat</i> methods in such cases.
 *
 * @see <a href="https://github.com/xmlunit/xmlunit/issues/135">GitHub issude #135</a>
 * @since XMLUnit 2.6.2
 */
class AssertionsAdapter {

    static <T> AbstractObjectAssert<?, T> assertThat(T actual) {
        return new ObjectAssert<>(actual);
    }

    static <T> AbstractObjectArrayAssert<?, T> assertThat(T[] actual) {
        return Assertions.assertThat(actual);
    }

    static AbstractCharSequenceAssert<?, String> assertThat(String actual) {
        return Assertions.assertThat(actual);
    }

    static AbstractIntegerAssert<?> assertThat(int actual) {
        return Assertions.assertThat(actual);
    }

    static AbstractDoubleAssert<?> assertThat(double actual) {
        return Assertions.assertThat(actual);
    }

    static AbstractBooleanAssert<?> assertThat(boolean actual) {
        return Assertions.assertThat(actual);
    }
}

@@ -929,26 +929,114 @@
 ore.api.
+BooleanAssert;%0Aimport org.assertj.core.api.DoubleAssert;%0Aimport org.assertj.core.api.Integer
 Assert
-ions
 ;%0Aimport
@@ -1068,97 +1068,154 @@
 ectA
+rrayA
 ssert;%0A
-%0A/**%0A * Class that is proxy for %7B@link org.assertj.core.api.Assertions#assertThat%7D
+import org.assertj.core.api.ObjectAssert;%0Aimport org.assertj.core.api.StringAssert;%0A%0A/**%0A * Class that is proxy for AssertJ assertions
  use
@@ -1953,37 +1953,39 @@
  return 
-Assertions.a
+new ObjectArrayA
 ssert
-That
+%3C%3E
 (actual)
@@ -2085,36 +2085,31 @@
  return 
-Assertions.assertTha
+new StringAsser
 t(actual
@@ -2194,36 +2194,32 @@
  return 
-Assertions.assertTha
+new IntegerAsser
 t(actual
@@ -2306,36 +2306,31 @@
  return 
-Assertions.assertTha
+new DoubleAsser
 t(actual
@@ -2423,28 +2423,24 @@
 urn 
-Assertions.assertTha
+new BooleanAsser
 t(ac

Use concrete type of assertions instead Assertions.assertThat API