chore(artifacts): remove reference to artifact-store.enabled (#6114)

and always construct artifact store-related beans

since spinnaker/kork#1120 removes the artifact-store.enabled
property such that ArtifactStore beans are always present.

clouddriver-core/src/main/java/com/netflix/spinnaker/clouddriver/config/CloudDriverConfig.java

@@ -425,7 +425,6 @@ ThreadPoolTaskScheduler threadPoolTaskScheduler(
   }
 
   @Bean
-  @ConditionalOnExpression("${artifact-store.enabled:false}")
   ArtifactDeserializer artifactDeserializer(
       ArtifactStore storage, @Qualifier("artifactObjectMapper") ObjectMapper objectMapper) {
     return new ArtifactDeserializer(objectMapper, storage);

clouddriver-web/src/main/groovy/com/netflix/spinnaker/clouddriver/Main.groovy

@@ -28,8 +28,6 @@ import org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticSearc
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
 import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
@@ -88,20 +86,12 @@ class Main extends SpringBootServletInitializer {
 
   @Bean
   @Primary
-  @ConditionalOnBean(value = ArtifactDeserializer.class)
   ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) {
     return builder.createXmlMapper(false)
       .mixIn(Artifact.class, ArtifactMixin.class)
       .build()
   }
 
-  @Bean
-  @Primary
-  @ConditionalOnMissingBean(value = ArtifactDeserializer.class)
-  ObjectMapper jacksonObjectMapper(Jackson2ObjectMapperBuilder builder) {
-    return builder.createXmlMapper(false).build()
-  }
-
   @Override
   SpringApplicationBuilder configure(SpringApplicationBuilder application) {
     application
@@ -110,8 +100,8 @@ class Main extends SpringBootServletInitializer {
   }
 
   /**
-   * Used to deserialize artifacts utilizing an artifact store if it is enabled,
-   * and thus bypassing the default deserializer on the artifact object itself.
+   * Used to deserialize artifacts utilizing an artifact store, and thus
+   * bypassing the default deserializer on the artifact object itself.
    */
   @JsonDeserialize(using = ArtifactDeserializer.class)
   private static interface ArtifactMixin{}