/*
 * Copyright 2019 Immutables Authors and Contributors
 *
 * 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 org.immutables.criteria.matcher;

import java.util.Optional;
import java.util.OptionalDouble;

/**
 * Intersection type between {@link OptionalMatcher} and {@link NumberMatcher}.
 *
 * <p>Syntax sugar to avoid chaining {@code value()} method from {@link OptionalMatcher}
 * on long expressions with many optional elements.
 *
 * @param <R> root criteria type
 */
public interface OptionalNumberMatcher<R, V extends Number & Comparable<? super V>> extends NumberMatcher<R, V>, PresentAbsentMatcher<R> {

  /**
   * Self-type for this matcher
   */
  interface Self<V extends Number & Comparable<? super V>> extends Template<Self<V>, V, Void>, Disjunction<Template<Self<V>, V, Void>> {}

  interface Template<R, V extends Number & Comparable<? super V>, P> extends OptionalNumberMatcher<R, V>, WithMatcher<R, Self<V>>,
          NotMatcher<R, Self<V>>, Projection<P>, Aggregation.NumberTemplate<Optional<V>, OptionalDouble, OptionalDouble> {}

  /**
   * Similar to main {@link OptionalNumberMatcher.Template} but with {@code @Nullable} projections and aggregations
   */
  interface NullableTemplate<R, V extends Number & Comparable<? super V>> extends OptionalNumberMatcher<R, V>, WithMatcher<R, Self<V>>,
          NotMatcher<R, Self<V>>, Projection<V>, Aggregation.NumberTemplate<V, Double, Double>{}

  @SuppressWarnings("unchecked")
  static <R> CriteriaCreator<R> creator() {
    class Local extends AbstractContextHolder implements Self {
      private Local(CriteriaContext context) {
        super(context);
      }
    }

    return ctx -> (R) new Local(ctx);
  }

}

@@ -1563,370 +1563,18 @@
  %7B%7D%0A
-%0A  /**%0A   * Similar to main %7B@link OptionalNumberMatcher.Template%7D but with %7B@code @Nullable%7D projections and aggregations%0A   */%0A  interface NullableTemplate%3CR, V extends Number & Comparable%3C? super V%3E%3E extends OptionalNumberMatcher%3CR, V%3E, WithMatcher%3CR, Self%3CV%3E%3E,%0A          NotMatcher%3CR, Self%3CV%3E%3E, Projection%3CV%3E, Aggregation.NumberTemplate%3CV, Double, Double%3E%7B%7D%0A
+          
 %0A  @

Remove nullable template from OptionalNumberMatcher