1 files changed, 8 insertions, 8 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
index c7f92d2184..2b23c52cd0 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
@@ -54,20 +54,20 @@ public class ArtifactResolverImpl implements ArtifactsResolver {
         Map<String, ArtifactDefinition> deploymentArtifacts = Optional.ofNullable(component.getDeploymentArtifacts()).orElse(Collections.emptyMap());
         Map<String, ArtifactDefinition> artifacts = Optional.ofNullable(component.getArtifacts()).orElse(Collections.emptyMap());
         Map<String, ArtifactDefinition> interfaceArtifacts= Collections.emptyMap();
-        if (componentType == ComponentTypeEnum.RESOURCE) {
-            Map<String, InterfaceDefinition> interfaces = ((Resource) component).getInterfaces();
-            if (MapUtils.isNotEmpty(interfaces)) {
-                interfaceArtifacts = interfaces.values().stream()
-                        .flatMap(inte -> inte.getOperationsMap().values().stream())
-                        .map(operation -> operation.getImplementationArtifact())
-                        .collect(Collectors.toMap(artifactDefinition -> artifactDefinition.getUniqueId(), artifactDefinition -> artifactDefinition));
-            }
+        Map<String, InterfaceDefinition> interfaces = component.getInterfaces();
+        if (MapUtils.isNotEmpty(interfaces)) {
+            interfaceArtifacts = interfaces.values().stream()
+                    .flatMap(inte -> inte.getOperationsMap().values().stream())
+                    .map(operation -> operation.getImplementationArtifact())
+                    .collect(Collectors.toMap(artifactDefinition -> artifactDefinition.getUniqueId(),
+                            artifactDefinition -> artifactDefinition));
         }
 
         Map<String, ArtifactDefinition> serviceApiArtifacts = Collections.emptyMap();
         if (componentType.equals(ComponentTypeEnum.SERVICE)) {
             serviceApiArtifacts = Optional.ofNullable(((Service) component).getServiceApiArtifacts()).orElse(Collections.emptyMap());
         }
+
         return appendAllArtifacts(deploymentArtifacts, artifacts, interfaceArtifacts, serviceApiArtifacts);
     }