mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Use consistent method names.

Browse source
This commit is contained in:
Michael Lipp 2025-01-25 13:39:22 +01:00
parent 5d722abd2e
commit 2a70c74234
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java
View file

@ -86,14 +86,14 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
// Maybe override logging.properties from reconciler configuration. // Maybe override logging.properties from reconciler configuration.
DataPath.<String> get(model, "reconciler", "loggingProperties") DataPath.<String> get(model, "reconciler", "loggingProperties")
.ifPresent(props -> { .ifPresent(props -> {
GsonPtr.to(mapDef.getRaw()).get(JsonObject.class, "data") GsonPtr.to(mapDef.getRaw()).getAs(JsonObject.class, "data")
.get().addProperty("logging.properties", props); .get().addProperty("logging.properties", props);
}); });
// Maybe override logging.properties from VM definition. // Maybe override logging.properties from VM definition.
DataPath.<String> get(model, "cr", "spec", "loggingProperties") DataPath.<String> get(model, "cr", "spec", "loggingProperties")
.ifPresent(props -> { .ifPresent(props -> {
GsonPtr.to(mapDef.getRaw()).get(JsonObject.class, "data") GsonPtr.to(mapDef.getRaw()).getAs(JsonObject.class, "data")
.get().addProperty("logging.properties", props); .get().addProperty("logging.properties", props);
}); });

2
org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/PvcReconciler.java
View file

@ -204,7 +204,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
// If bound, use json merge, omitting immutable fields // If bound, use json merge, omitting immutable fields
var spec = GsonPtr.to(pvcDef.getRaw()).to("spec"); var spec = GsonPtr.to(pvcDef.getRaw()).to("spec");
spec.removeExcept("volumeAttributesClassName", "resources"); spec.removeExcept("volumeAttributesClassName", "resources");
spec.access("resources").ifPresent(p -> p.removeExcept("requests")); spec.get("resources").ifPresent(p -> p.removeExcept("requests"));
PatchOptions opts = new PatchOptions(); PatchOptions opts = new PatchOptions();
opts.setFieldManager("kubernetes-java-kubectl-apply"); opts.setFieldManager("kubernetes-java-kubectl-apply");
if (pvcStub.patch(V1Patch.PATCH_FORMAT_JSON_MERGE_PATCH, if (pvcStub.patch(V1Patch.PATCH_FORMAT_JSON_MERGE_PATCH,

18
org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/GsonPtr.java
View file

@ -103,7 +103,7 @@ public class GsonPtr {
* @return the Gson pointer * @return the Gson pointer
*/ */
@SuppressWarnings({ "PMD.ShortMethodName", "PMD.PreserveStackTrace" }) @SuppressWarnings({ "PMD.ShortMethodName", "PMD.PreserveStackTrace" })
public Optional<GsonPtr> access(Object... selectors) { public Optional<GsonPtr> get(Object... selectors) {
JsonElement element = position; JsonElement element = position;
for (Object sel : selectors) { for (Object sel : selectors) {
if (element instanceof JsonObject obj if (element instanceof JsonObject obj
@ -147,7 +147,7 @@ public class GsonPtr {
* @return the result * @return the result
*/ */
@SuppressWarnings({ "PMD.AvoidBranchingStatementAsLastInLoop" }) @SuppressWarnings({ "PMD.AvoidBranchingStatementAsLastInLoop" })
public <T extends JsonElement> T get(Class<T> cls) { public <T extends JsonElement> T getAs(Class<T> cls) {
if (cls.isAssignableFrom(position.getClass())) { if (cls.isAssignableFrom(position.getClass())) {
return cls.cast(position); return cls.cast(position);
} }
@ -166,7 +166,7 @@ public class GsonPtr {
*/ */
@SuppressWarnings({ "PMD.AvoidBranchingStatementAsLastInLoop" }) @SuppressWarnings({ "PMD.AvoidBranchingStatementAsLastInLoop" })
public <T extends JsonElement> Optional<T> public <T extends JsonElement> Optional<T>
get(Class<T> cls, Object... selectors) { getAs(Class<T> cls, Object... selectors) {
JsonElement element = position; JsonElement element = position;
for (Object sel : selectors) { for (Object sel : selectors) {
if (element instanceof JsonObject obj if (element instanceof JsonObject obj
@ -201,7 +201,7 @@ public class GsonPtr {
* @return the as string * @return the as string
*/ */
public Optional<String> getAsString(Object... selectors) { public Optional<String> getAsString(Object... selectors) {
return get(JsonPrimitive.class, selectors) return getAs(JsonPrimitive.class, selectors)
.map(JsonPrimitive::getAsString); .map(JsonPrimitive::getAsString);
} }
@ -212,7 +212,7 @@ public class GsonPtr {
* @return the as string * @return the as string
*/ */
public Optional<Integer> getAsInt(Object... selectors) { public Optional<Integer> getAsInt(Object... selectors) {
return get(JsonPrimitive.class, selectors) return getAs(JsonPrimitive.class, selectors)
.map(JsonPrimitive::getAsInt); .map(JsonPrimitive::getAsInt);
} }
@ -223,7 +223,7 @@ public class GsonPtr {
* @return the as string * @return the as string
*/ */
public Optional<BigInteger> getAsBigInteger(Object... selectors) { public Optional<BigInteger> getAsBigInteger(Object... selectors) {
return get(JsonPrimitive.class, selectors) return getAs(JsonPrimitive.class, selectors)
.map(JsonPrimitive::getAsBigInteger); .map(JsonPrimitive::getAsBigInteger);
} }
@ -234,7 +234,7 @@ public class GsonPtr {
* @return the as string * @return the as string
*/ */
public Optional<Long> getAsLong(Object... selectors) { public Optional<Long> getAsLong(Object... selectors) {
return get(JsonPrimitive.class, selectors) return getAs(JsonPrimitive.class, selectors)
.map(JsonPrimitive::getAsLong); .map(JsonPrimitive::getAsLong);
} }
@ -245,7 +245,7 @@ public class GsonPtr {
* @return the boolean * @return the boolean
*/ */
public Optional<Boolean> getAsBoolean(Object... selectors) { public Optional<Boolean> getAsBoolean(Object... selectors) {
return get(JsonPrimitive.class, selectors) return getAs(JsonPrimitive.class, selectors)
.map(JsonPrimitive::getAsBoolean); .map(JsonPrimitive::getAsBoolean);
} }
@ -260,7 +260,7 @@ public class GsonPtr {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T extends JsonElement> List<T> getAsListOf(Class<T> cls, public <T extends JsonElement> List<T> getAsListOf(Class<T> cls,
Object... selectors) { Object... selectors) {
return get(JsonArray.class, selectors).map(a -> (List<T>) a.asList()) return getAs(JsonArray.class, selectors).map(a -> (List<T>) a.asList())
.orElse(Collections.emptyList()); .orElse(Collections.emptyList());
} }