-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(api): remove jackson annotations from model (#4798)
Not having the jackson annotations directly on the model allows them to more easily be moved to an external library without needing a Jackson dependency.
- Loading branch information
Showing
17 changed files
with
299 additions
and
27 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
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
49 changes: 49 additions & 0 deletions
49
...er-core/src/main/java/com/netflix/spinnaker/clouddriver/jackson/ClouddriverApiModule.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,49 @@ | ||
| /* | ||
| * Copyright 2020 Armory | ||
| * | ||
| * 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.netflix.spinnaker.clouddriver.jackson; | ||
|
|
||
| import com.fasterxml.jackson.databind.module.SimpleModule; | ||
| import com.netflix.spinnaker.clouddriver.jackson.mixins.*; | ||
| import com.netflix.spinnaker.clouddriver.model.Cluster; | ||
| import com.netflix.spinnaker.clouddriver.model.LoadBalancerProvider; | ||
| import com.netflix.spinnaker.clouddriver.model.SecurityGroup; | ||
| import com.netflix.spinnaker.clouddriver.model.ServerGroup; | ||
| import com.netflix.spinnaker.clouddriver.model.securitygroups.Rule; | ||
|
|
||
| public class ClouddriverApiModule extends SimpleModule { | ||
|
|
||
| public ClouddriverApiModule() { | ||
| super("Clouddriver API"); | ||
| } | ||
|
|
||
| @Override | ||
| public void setupModule(SetupContext context) { | ||
| super.setupModule(context); | ||
| context.setMixInAnnotations(SecurityGroup.class, SecurityGroupMixin.class); | ||
| context.setMixInAnnotations(Rule.class, RuleMixin.class); | ||
| context.setMixInAnnotations(Cluster.class, ClusterMixin.class); | ||
| context.setMixInAnnotations(ServerGroup.class, ServerGroupMixin.class); | ||
| context.setMixInAnnotations(ServerGroup.ImageSummary.class, ImageSummaryMixin.class); | ||
| context.setMixInAnnotations(ServerGroup.ImagesSummary.class, ImagesSummaryMixin.class); | ||
| context.setMixInAnnotations( | ||
| LoadBalancerProvider.Item.class, LoadBalancerProviderItemMixin.class); | ||
| context.setMixInAnnotations( | ||
| LoadBalancerProvider.ByAccount.class, LoadBalancerProviderByAccountMixin.class); | ||
| context.setMixInAnnotations( | ||
| LoadBalancerProvider.ByRegion.class, LoadBalancerProviderByRegionMixin.class); | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
...ver-core/src/main/java/com/netflix/spinnaker/clouddriver/jackson/mixins/ClusterMixin.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,37 @@ | ||
| /* | ||
| * Copyright 2020 Armory | ||
| * | ||
| * 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.netflix.spinnaker.clouddriver.jackson.mixins; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnore; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import com.netflix.spinnaker.clouddriver.model.LoadBalancer; | ||
| import com.netflix.spinnaker.clouddriver.model.NullCollectionSerializer; | ||
| import com.netflix.spinnaker.clouddriver.model.ServerGroup; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| public interface ClusterMixin { | ||
|
|
||
| @JsonSerialize(nullsUsing = NullCollectionSerializer.class) | ||
| Set<? extends ServerGroup> getServerGroups(); | ||
|
|
||
| @JsonSerialize(nullsUsing = NullCollectionSerializer.class) | ||
| Set<? extends LoadBalancer> getLoadBalancers(); | ||
|
|
||
| @JsonIgnore | ||
| Map<String, Object> getExtraAttributes(); | ||
| } |
22 changes: 22 additions & 0 deletions
22
...ore/src/main/java/com/netflix/spinnaker/clouddriver/jackson/mixins/ImageSummaryMixin.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,22 @@ | ||
| /* | ||
| * Copyright 2020 Armory | ||
| * | ||
| * 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.netflix.spinnaker.clouddriver.jackson.mixins; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public interface ImageSummaryMixin {} |
22 changes: 22 additions & 0 deletions
22
...re/src/main/java/com/netflix/spinnaker/clouddriver/jackson/mixins/ImagesSummaryMixin.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,22 @@ | ||
| /* | ||
| * Copyright 2020 Armory | ||
| * | ||
| * 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.netflix.spinnaker.clouddriver.jackson.mixins; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public interface ImagesSummaryMixin {} |
27 changes: 27 additions & 0 deletions
27
.../com/netflix/spinnaker/clouddriver/jackson/mixins/LoadBalancerProviderByAccountMixin.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,27 @@ | ||
| /* | ||
| * Copyright 2020 Armory | ||
| * | ||
| * 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.netflix.spinnaker.clouddriver.jackson.mixins; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.netflix.spinnaker.clouddriver.model.LoadBalancerProvider; | ||
| import java.util.List; | ||
|
|
||
| public interface LoadBalancerProviderByAccountMixin { | ||
|
|
||
| @JsonProperty("regions") | ||
| List<? extends LoadBalancerProvider.ByRegion> getByRegions(); | ||
| } |
30 changes: 30 additions & 0 deletions
30
...a/com/netflix/spinnaker/clouddriver/jackson/mixins/LoadBalancerProviderByRegionMixin.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,30 @@ | ||
| /* | ||
| * Copyright 2020 Armory | ||
| * | ||
| * 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.netflix.spinnaker.clouddriver.jackson.mixins; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.netflix.spinnaker.clouddriver.model.LoadBalancerProvider; | ||
| import java.util.List; | ||
|
|
||
| public interface LoadBalancerProviderByRegionMixin { | ||
|
|
||
| @JsonProperty("name") | ||
| String getName(); | ||
|
|
||
| @JsonProperty("loadBalancers") | ||
| List<? extends LoadBalancerProvider.Details> getLoadBalancers(); | ||
| } |
Oops, something went wrong.