forked from fabric8io/kubernetes-client
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix fabric8io#3625: updating the default logic for maps and objectmet…
…adata fixing format
- Loading branch information
Showing
6 changed files
with
158 additions
and
44 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
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
77 changes: 77 additions & 0 deletions
77
...onschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/Fabric8DefaultRule.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,77 @@ | ||
| /** | ||
| * 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.kubernetes.jsonschema2pojo; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.sun.codemodel.JClass; | ||
| import com.sun.codemodel.JExpr; | ||
| import com.sun.codemodel.JFieldVar; | ||
| import com.sun.codemodel.JType; | ||
| import org.jsonschema2pojo.Schema; | ||
| import org.jsonschema2pojo.rules.DefaultRule; | ||
| import org.jsonschema2pojo.rules.RuleFactory; | ||
|
|
||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Adds default map and objectmeta handling | ||
| */ | ||
| public class Fabric8DefaultRule extends DefaultRule { | ||
|
|
||
| public static final String OBJECTMETA = "io.fabric8.kubernetes.api.model.ObjectMeta"; | ||
| public static final String ANNOTATION_VALUE_FILTER = "valueFilter"; | ||
|
|
||
| private final RuleFactory ruleFactory; | ||
|
|
||
| public Fabric8DefaultRule(RuleFactory ruleFactory) { | ||
| super(ruleFactory); | ||
| this.ruleFactory = ruleFactory; | ||
| } | ||
|
|
||
| @Override | ||
| public JFieldVar apply(String nodeName, JsonNode node, JsonNode parent, JFieldVar field, Schema currentSchema) { | ||
| JType fieldType = field.type(); | ||
| String fieldTypeName = fieldType.fullName(); | ||
|
|
||
| if (node == null || node.asText() == null || node.asText().isEmpty()) { | ||
| if (ruleFactory.getGenerationConfig().isInitializeCollections() && fieldTypeName.startsWith(Map.class.getName())) { | ||
| JClass keyGenericType = ((JClass) fieldType).getTypeParameters().get(0); | ||
| JClass valueGenericType = ((JClass) fieldType).getTypeParameters().get(1); | ||
|
|
||
| JClass mapImplClass = fieldType.owner().ref(LinkedHashMap.class); | ||
| mapImplClass = mapImplClass.narrow(keyGenericType, valueGenericType); | ||
| // maps are not marked as omitJavaEmpty - it's simplest to just add the annotation here, rather than updating the generator | ||
| field.annotate(JsonInclude.class).param(KubernetesCoreTypeAnnotator.ANNOTATION_VALUE, JsonInclude.Include.NON_EMPTY); | ||
| field.init(JExpr._new(mapImplClass)); | ||
| } | ||
|
|
||
| if (fieldTypeName.equals(OBJECTMETA)) { | ||
| JClass implClass = fieldType.owner().ref(fieldTypeName); | ||
| // annotate to omit the default | ||
| field.annotate(JsonInclude.class).param(KubernetesCoreTypeAnnotator.ANNOTATION_VALUE, JsonInclude.Include.CUSTOM) | ||
| .param(ANNOTATION_VALUE_FILTER, implClass); | ||
| field.init(JExpr._new(implClass)); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| return super.apply(nodeName, node, parent, field, currentSchema); | ||
| } | ||
|
|
||
| } |
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