rename fixes

Author: christiangoerdes

annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java

@@ -37,7 +37,7 @@
  * - Choose/cases/case has one nesting to much
  * - apiKey/extractors/expressionExtractor/expression => too much?
  */
-public class JsonSchemaGenerator extends AbstractK8sGenerator {
+public class JsonSchemaGenerator extends AbstractGrammar {
 
  private final Map<String, Boolean> topLevelAdded = new HashMap<>();
 

…tor/kubernetes/AbstractK8sGenerator.java …enerator/kubernetes/AbstractGrammar.javaannot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/AbstractK8sGenerator.java renamed to annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/AbstractGrammar.java annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/AbstractK8sGenerator.java renamed to annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/AbstractGrammar.java

@@ -14,8 +14,6 @@
 package com.predic8.membrane.annot.generator.kubernetes;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.node.*;
-import com.predic8.membrane.annot.generator.kubernetes.model.*;
 import com.predic8.membrane.annot.model.ElementInfo;
 import com.predic8.membrane.annot.model.MainInfo;
 import com.predic8.membrane.annot.model.Model;
@@ -34,7 +32,7 @@
 /**
  * Bundles functionality for kubernetes file generation
  */
-public abstract class AbstractK8sGenerator {
+public abstract class AbstractGrammar {
 
  protected final ObjectMapper om = new ObjectMapper();
  protected final ObjectWriter writer = om.writerWithDefaultPrettyPrinter();
@@ -53,7 +51,7 @@ public WritableNames(ElementInfo ei) {
  }
  }
 
- public AbstractK8sGenerator(final ProcessingEnvironment processingEnv) {
+ public AbstractGrammar(final ProcessingEnvironment processingEnv) {
  this.processingEnv = processingEnv;
  }
 

…rator/kubernetes/K8sHelperGenerator.java …/annot/generator/kubernetes/Grammar.javaannot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/K8sHelperGenerator.java renamed to annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/Grammar.java annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/K8sHelperGenerator.java renamed to annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/Grammar.java

@@ -27,15 +27,15 @@
 /**
  * Autogenerates a helper file for JSON parsing
  */
-public class K8sHelperGenerator extends AbstractK8sGenerator {
+public class Grammar extends AbstractGrammar {
 
- public K8sHelperGenerator(ProcessingEnvironment processingEnv) {
+ public Grammar(ProcessingEnvironment processingEnv) {
  super(processingEnv);
  }
 
  @Override
  protected String fileName() {
- return K8sHelperGenerator.class.getSimpleName() + "AutoGenerated";
+ return Grammar.class.getSimpleName() + "AutoGenerated";
  }
 
  @Override
@@ -90,12 +90,12 @@ private void writeClassContent(Writer w, MainInfo mainInfo) throws IOException {
  import java.util.List;
  import java.util.HashMap;
  import java.util.ArrayList;
- import com.predic8.membrane.annot.K8sHelperGenerator;
+ import com.predic8.membrane.annot.Grammar;
 
  /**
  * Automatically generated by {@link %s}
  */
- public class %s implements K8sHelperGenerator {
+ public class %s implements Grammar {
  private static Map<String, Class<?>> elementMapping = new HashMap<>();
  private static Map<String, Map<String, Class<?>>> localElementMapping = new HashMap<>();
  private static List<String> crdSingularNames = new ArrayList<>();
@@ -137,7 +137,7 @@ public String getSchemaLocation() {
  static {
  """.formatted(
  mainInfo.getAnnotation().outputPackage(),
- K8sHelperGenerator.class.getName(),
+ Grammar.class.getName(),
  fileName(),
  mainInfo.getAnnotation().outputPackage()
  .replaceAll(".spring$", ".json")

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/K8sJsonSchemaGenerator.java

@@ -28,7 +28,7 @@
 /**
  * Generates JSON Schema (draft 2019-09/2020-12) to validate Kubernetes CustomResourceDefinitions.
  */
-public class K8sJsonSchemaGenerator extends AbstractK8sGenerator {
+public class K8sJsonSchemaGenerator extends AbstractGrammar {
 
  public K8sJsonSchemaGenerator(ProcessingEnvironment processingEnv) {
  super(processingEnv);

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/K8sYamlGenerator.java

@@ -29,7 +29,7 @@
 /**
  * Generates ClusterRoles, ClusterRoleBindings and CustomResourceDefinitions for kubernetes integration.
  */
-public class K8sYamlGenerator extends AbstractK8sGenerator {
+public class K8sYamlGenerator extends AbstractGrammar {
 
  private final List<String> crdPlurals;
 

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/KubernetesBootstrapper.java

@@ -32,6 +32,6 @@ public KubernetesBootstrapper(final ProcessingEnvironment processingEnv) {
  public void boot(final Model model) throws IOException {
  new K8sYamlGenerator(processingEnv).write(model);
  new K8sJsonSchemaGenerator(processingEnv).write(model);
- new K8sHelperGenerator(processingEnv).write(model);
+ new Grammar(processingEnv).write(model);
  }
 }

annot/src/main/java/com/predic8/membrane/annot/yaml/MethodSetter.java

@@ -1,3 +1,17 @@
+/* Copyright 2025 predic8 GmbH, www.predic8.com
+
+ 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 com.predic8.membrane.annot.yaml;
 
 import com.predic8.membrane.annot.MCChildElement;

annot/src/main/java/com/predic8/membrane/annot/yaml/NodeValidationUtils.java

@@ -1,3 +1,17 @@
+/* Copyright 2025 predic8 GmbH, www.predic8.com
+
+ 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 com.predic8.membrane.annot.yaml;
 
 import com.fasterxml.jackson.databind.JsonNode;

annot/src/main/java/com/predic8/membrane/annot/yaml/ParsingContext.java

@@ -1,3 +1,17 @@
+/* Copyright 2025 predic8 GmbH, www.predic8.com
+
+ 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 com.predic8.membrane.annot.yaml;
 
 import com.predic8.membrane.annot.*;

annot/src/main/java/com/predic8/membrane/annot/yaml/ParsingException.java

@@ -1,3 +1,17 @@
+/* Copyright 2025 predic8 GmbH, www.predic8.com
+
+ 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 com.predic8.membrane.annot.yaml;
 
 import com.fasterxml.jackson.databind.JsonNode;