forked from fabric8io/kubernetes-client
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: @SchemaSwap can only be used once
@SchemaSwap is now repeatable, so multiple modifications can be applied from the same resource root. Fixed a bug when the swap was "used up" after just one usage, meaning that if the referenced type was used multiple times in object hierarchy, only the first one was swapped. Fixes fabric8io#4350
- Loading branch information
Showing
9 changed files
with
421 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
crd-generator/api/src/main/java/io/fabric8/crd/generator/InternalSchemaSwaps.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /** | ||
| * Copyright (C) 2015 Red Hat, Inc. | ||
| * | ||
| * 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.fabric8.crd.generator; | ||
|
|
||
| import io.sundr.model.ClassRef; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import java.util.StringJoiner; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class InternalSchemaSwaps { | ||
| private final Map<Key, Value> swaps = new HashMap<>(); | ||
|
|
||
| public void registerSwap(ClassRef definitionType, ClassRef originalType, String fieldName, ClassRef targetType) { | ||
| Value value = new Value(definitionType, originalType, fieldName, targetType); | ||
| swaps.put(new Key(originalType, fieldName), value); | ||
| } | ||
|
|
||
| public Stream<Value> getUnusedSwaps() { | ||
| return swaps.values().stream().filter(value -> !value.used); | ||
| } | ||
|
|
||
| public Optional<ClassRef> lookupAndMark(ClassRef originalType, String name) { | ||
| Value value = swaps.get(new Key(originalType, name)); | ||
| if (value != null) { | ||
| value.markUsed(); | ||
| return Optional.of(value.getTargetType()); | ||
| } else { | ||
| return Optional.empty(); | ||
| } | ||
| } | ||
|
|
||
| private static class Key { | ||
| private final ClassRef originalType; | ||
| private final String fieldName; | ||
|
|
||
| public Key(ClassRef originalType, String fieldName) { | ||
| this.originalType = originalType; | ||
| this.fieldName = fieldName; | ||
| } | ||
|
|
||
| public ClassRef getOriginalType() { | ||
| return originalType; | ||
| } | ||
|
|
||
| public String getFieldName() { | ||
| return fieldName; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| Key key = (Key) o; | ||
| return Objects.equals(originalType, key.originalType) && Objects.equals(fieldName, key.fieldName); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(originalType, fieldName); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return new StringJoiner(", ", Key.class.getSimpleName() + "[", "]") | ||
| .add("originalType=" + originalType) | ||
| .add("fieldName='" + fieldName + "'") | ||
| .toString(); | ||
| } | ||
| } | ||
|
|
||
| public static class Value { | ||
| private final ClassRef originalType; | ||
| private final String fieldName; | ||
| private final ClassRef targetType; | ||
| private boolean used; | ||
| private final ClassRef definitionType; | ||
|
|
||
| public Value(ClassRef definitionType, ClassRef originalType, String fieldName, ClassRef targetType) { | ||
| this.definitionType = definitionType; | ||
| this.originalType = originalType; | ||
| this.fieldName = fieldName; | ||
| this.targetType = targetType; | ||
| this.used = false; | ||
| } | ||
|
|
||
| private void markUsed() { | ||
| this.used = true; | ||
| } | ||
|
|
||
| public ClassRef getOriginalType() { | ||
| return originalType; | ||
| } | ||
|
|
||
| public String getFieldName() { | ||
| return fieldName; | ||
| } | ||
|
|
||
| public ClassRef getTargetType() { | ||
| return targetType; | ||
| } | ||
|
|
||
| public boolean isUsed() { | ||
| return used; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "@SchemaSwap(originalType=" + originalType + ", fieldName=\"" + fieldName + "\", targetType=" + targetType | ||
| + ") on " + definitionType; | ||
| } | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
crd-generator/api/src/test/java/io/fabric8/crd/example/extraction/MultipleSchemaSwaps.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /** | ||
| * Copyright (C) 2015 Red Hat, Inc. | ||
| * | ||
| * 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.fabric8.crd.example.extraction; | ||
|
|
||
| import io.fabric8.crd.generator.annotation.SchemaSwap; | ||
| import io.fabric8.kubernetes.client.CustomResource; | ||
|
|
||
| @SchemaSwap(originalType = SchemaSwapSpec.SomeObject.class, fieldName = "shouldBeString", targetType = String.class) | ||
| @SchemaSwap(originalType = SchemaSwapSpec.AnotherObject.class, fieldName = "shouldBeInt", targetType = Integer.class) | ||
| public class MultipleSchemaSwaps extends CustomResource<SchemaSwapSpec, Void> { | ||
|
|
||
| } |
Oops, something went wrong.