minor: refactoring

Author: predic8

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

@@ -19,7 +19,7 @@
 
 public class BeanDefinition {
 
- public static String PROTOTYPE = "prototype";
+ public static final String PROTOTYPE = "prototype";
 
  private final String name;
  private final String namespace;
@@ -31,9 +31,8 @@ public class BeanDefinition {
 
  /**
  * Only called from K8S.
- * TODO Maybe change constructur to static create4Kubernetes
  */
- public BeanDefinition(WatchAction action, JsonNode node) {
+ private BeanDefinition(WatchAction action, JsonNode node) {
  this.action = action;
  this.node = node;
  JsonNode metadata = node.get("metadata"); // TODO What if metadata is null?
@@ -48,6 +47,10 @@ public BeanDefinition(WatchAction action, JsonNode node) {
  uid = metadata.get("uid").asText();
  }
 
+ public static BeanDefinition create4Kubernetes(WatchAction action, JsonNode node) {
+ return new BeanDefinition(action, node);
+ }
+
  public BeanDefinition(String kind, String name, String namespace, String uid, JsonNode node) {
  this.kind = kind;
  this.name = name;

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

@@ -13,6 +13,8 @@
  limitations under the License. */
 package com.predic8.membrane.annot.yaml;
 
+import com.predic8.membrane.annot.*;
+
 import java.util.List;
 
 public interface BeanRegistry {
@@ -23,4 +25,6 @@ public interface BeanRegistry {
 
  void registerBeanDefinitions(List<BeanDefinition> beanDefinitions);
 
+ Grammar getGrammar();
+
 }

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

@@ -23,6 +23,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
+import static com.predic8.membrane.annot.yaml.BeanDefinition.create4Kubernetes;
 import static com.predic8.membrane.annot.yaml.WatchAction.*;
 
 public class BeanRegistryImplementation implements BeanRegistry {
@@ -105,7 +106,7 @@ private Object define(BeanDefinition bd) throws IOException, ParsingException {
  * May be called from multiple threads.
  */
  public void handle(WatchAction action, JsonNode node) {
- changeEvents.add(new BeanDefinitionChanged(new BeanDefinition(action, node)));
+ changeEvents.add(new BeanDefinitionChanged(create4Kubernetes(action, node)));
  }
 
  /**
@@ -164,7 +165,7 @@ private void activationRun() {
  bds.remove(bd.getUid());
  }
  uidsToRemove.add(bd.getUid());
- } catch (Throwable e) {
+ } catch (Exception e) {
  log.error("Could not handle {} {}/{}", bd.getAction(), bd.getNamespace(), bd.getName(), e);
  }
  }
@@ -206,4 +207,9 @@ public Object resolveReference(String url) {
  public List<Object> getBeans() {
  return bds.values().stream().map(BeanDefinition::getBean).filter(Objects::nonNull).toList();
  }
+
+ @Override
+ public Grammar getGrammar() {
+ return grammar;
+ }
 }

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

@@ -21,7 +21,8 @@ record BeanDefinitionChanged(BeanDefinition bd) implements ChangeEvent {
 }
 
 /**
- * TODO What does this exactly mean? Is the complete configuration loaded?
+ * Signals that all static configuration (e.g., from YAML files) has been
+ * passed to the registry and initial activation can proceed.
  */
 record StaticConfigurationLoaded() implements ChangeEvent {
 }

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

@@ -82,13 +82,16 @@ public <T> void setSetter(T instance, ParsingContext ctx, JsonNode node, String
 
  private Object resolveSetterValue(ParsingContext ctx, JsonNode node, String key) throws WrongEnumConstantException, ParsingException {
  Class<?> wanted = getParameterType();
- if (wanted.equals(List.class) || wanted.equals(Collection.class)) return parseListIncludingStartEvent(ctx, node);
+ if (Collection.class.isAssignableFrom(wanted))
+ return parseListIncludingStartEvent(ctx, node);
 
  if (wanted.isEnum()) return parseEnum(wanted, node);
  if (wanted.equals(String.class)) return node.asText();
- if (wanted.equals(Integer.TYPE)) return parseInt(node.asText());
- if (wanted.equals(Long.TYPE)) return parseLong(node.asText());
- if (wanted.equals(Boolean.TYPE)) return parseBoolean(node.asText());
+
+ if (wanted == Integer.TYPE || wanted == Integer.class) return parseInt(node.asText());
+ if (wanted == Long.TYPE || wanted == Long.class) return parseLong(node.asText());
+ if (wanted == Boolean.TYPE || wanted == Boolean.class) return parseBoolean(node.asText());
+
  if (wanted.equals(Map.class) && McYamlIntrospector.hasOtherAttributes(setter)) return Map.of(key, node.asText());
  if (McYamlIntrospector.isStructured(setter)) {
  if (beanClass != null) return createAndPopulateNode(ctx.updateContext(key), beanClass, node);

core/src/main/java/com/predic8/membrane/core/kubernetes/KubernetesWatcher.java

@@ -40,14 +40,14 @@ public class KubernetesWatcher {
  private static final Logger LOG = LoggerFactory.getLogger(KubernetesWatcher.class);
 
  private final Router router;
- private final BeanRegistryImplementation beanCache;
+ private final BeanRegistryImplementation beanRegistry;
  private KubernetesClient client;
  private ExecutorService executors;
  private final ConcurrentHashMap<String, Closeable> watches = new ConcurrentHashMap<>();
 
  public KubernetesWatcher(Router router) {
  this.router = router;
- this.beanCache = new BeanRegistryImplementation(router, new GrammarAutoGenerated());
+ this.beanRegistry = new BeanRegistryImplementation(router, new GrammarAutoGenerated());
  }
 
  public void start() {
@@ -56,11 +56,11 @@ public void start() {
  return;
  }
 
- beanCache.start();
+ beanRegistry.start();
 
  client = getClient();
 
- List<String> crds = new GrammarAutoGenerated().getCrdSingularNames();
+ List<String> crds = beanRegistry.getGrammar().getCrdSingularNames();
  if (kvi.get().getResourcesList().size() > 0)
  crds = crds.stream().filter(s -> kvi.get().getResourcesList().contains(s)).toList();
  if (crds.size() > 0)
@@ -78,7 +78,7 @@ public void stop() {
  } catch (IOException e) {
  }
  });
- beanCache.stop();
+ beanRegistry.stop();
  }
 
  private KubernetesClient getClient() {
@@ -110,7 +110,7 @@ public void onEvent(WatchAction action, JsonNode node) {
  node.get("metadata").get("namespace").asText(),
  node.get("metadata").get("name").asText()));
 
- beanCache.handle(action, node.get("spec"));
+ beanRegistry.handle(action, node.get("spec"));
  } catch (Exception e) {
  e.printStackTrace();
  }

core/src/test/java/com/predic8/membrane/core/kubernetes/GenericYamlParserTest.java

@@ -48,6 +48,8 @@
 @TestInstance(Lifecycle.PER_CLASS)
 public class GenericYamlParserTest {
 
+ private static final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
+
  private static final Grammar K8S_HELPER = new GrammarAutoGenerated();
 
  @ParameterizedTest
@@ -342,6 +344,11 @@ public List<Object> getBeans() {
  public void registerBeanDefinitions(List<BeanDefinition> beanDefinitions) {
 
  }
+
+ @Override
+ public Grammar getGrammar() {
+ return null;
+ }
  }
 
  private static APIProxy parse(String yaml, BeanRegistry reg) {
@@ -350,7 +357,7 @@ private static APIProxy parse(String yaml, BeanRegistry reg) {
 
  public static JsonNode parse(String yaml) {
  try {
- return new ObjectMapper(new YAMLFactory()).readTree(yaml);
+ return yamlMapper.readTree(yaml);
  } catch (JsonProcessingException e) {
  throw new RuntimeException(e);
  }