/**
 * Copyright 2018 The original authors.
 *
 * 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.dekorate.crd.generator;

import io.dekorate.Generator;
import io.dekorate.Session;
import io.dekorate.WithSession;
import io.dekorate.config.ConfigurationSupplier;
import io.dekorate.config.AnnotationConfiguration;
import io.dekorate.config.PropertyConfiguration;
import io.dekorate.crd.adapter.CustomResourceConfigAdapter;
import io.dekorate.crd.annotation.CustomResource;
import io.dekorate.crd.confg.Keys;
import io.dekorate.crd.config.CustomResourceConfig;
import io.dekorate.crd.config.CustomResourceConfigBuilder;
import io.dekorate.crd.configurator.AddClassNameConfigurator;
import io.dekorate.crd.handler.CustomResourceHandler;
import io.sundr.codegen.functions.ElementTo;
import io.sundr.codegen.model.TypeDef;
import io.sundr.codegen.utils.ModelUtils;

import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
import java.util.Map;

public interface CustomResourceGenerator extends Generator, WithSession {

  @Override
  default void add(Map map) {
    on(new PropertyConfiguration<>(CustomResourceConfigAdapter.newBuilder(propertiesMap(map, CustomResourceConfig.class))));
  }

  default void on(ConfigurationSupplier<CustomResourceConfig> config) {
    Session session = getSession();
    session.configurators().add(config);
    session.handlers().add(new CustomResourceHandler(session.resources()));
  }
}

@@ -635,16 +635,39 @@
 rator;%0A%0A
+import java.util.Map;%0A%0A
 import i
@@ -720,40 +720,8 @@
 on;%0A
-import io.dekorate.WithSession;%0A
 impo
@@ -742,16 +742,26 @@
 .config.
+Annotation
 Configur
@@ -765,24 +765,16 @@
 guration
-Supplier
 ;%0Aimport
@@ -789,34 +789,24 @@
 rate.config.
-Annotation
 Configuratio
@@ -798,32 +798,40 @@
 ig.Configuration
+Supplier
 ;%0Aimport io.deko
@@ -952,18 +952,14 @@
 crd.
-annotation
+config
 .Cus
@@ -973,43 +973,14 @@
 urce
-;%0Aimport io.dekorate.crd.confg.Keys
+Config
 ;%0Aim
@@ -992,38 +992,39 @@
 io.dekorate.crd.
-config
+handler
 .CustomResourceC
@@ -1026,500 +1026,276 @@
 urce
-Config;%0Aimport io.dekorate.crd.config.CustomResourceConfigBuilder;%0Aimport io.dekorate.crd.configurator.AddClassNameConfigurator;%0Aimport io.dekorate.crd.handler.CustomResourceHandler;%0Aimport io.sundr.codegen.functions.ElementTo;%0Aimport io.sundr.codegen.model.TypeDef;%0Aimport io.sundr.codegen.utils.ModelUtils;%0A%0Aimport javax.lang.model.element.Element;%0Aimport javax.lang.model.element.TypeElement;%0Aimport java.util.Map;%0A%0Apublic interface CustomResourceGenerator extends Generator, WithSession %7B
+Handler;%0A%0Apublic interface CustomResourceGenerator extends Generator  %7B%0A%0A  @Override%0A  default void addAnnotationConfiguration(Map map) %7B%0A    on(new AnnotationConfiguration%3C%3E(CustomResourceConfigAdapter.newBuilder(propertiesMap(map, CustomResourceConfig.class))));%0A  %7D
 %0A%0A  
@@ -1322,16 +1322,37 @@
 void add
+PropertyConfiguration
 (Map map

Align annotation and property execution paths