Mvoe getReferenceCount to IGenericRepository

winery · Sep 24, 2017 · ab9ffaf · ab9ffaf
1 parent 2c15c9b
commit ab9ffaf
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 113 deletions.
diff --git a/...repository/rest/resources/entitytemplates/artifacttemplates/ArtifactTemplateResource.java b/...repository/rest/resources/entitytemplates/artifacttemplates/ArtifactTemplateResource.java
@@ -14,10 +14,6 @@
 package org.eclipse.winery.repository.rest.resources.entitytemplates.artifacttemplates;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.SortedSet;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -26,40 +22,25 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
-import javax.xml.namespace.QName;
 
 import org.eclipse.winery.common.constants.MimeTypes;
 import org.eclipse.winery.common.ids.definitions.ArtifactTemplateId;
 import org.eclipse.winery.common.ids.definitions.ArtifactTypeId;
-import org.eclipse.winery.common.ids.definitions.NodeTypeImplementationId;
-import org.eclipse.winery.common.ids.definitions.RelationshipTypeImplementationId;
-import org.eclipse.winery.common.ids.definitions.ServiceTemplateId;
 import org.eclipse.winery.model.tosca.HasType;
 import org.eclipse.winery.model.tosca.TArtifactTemplate;
-import org.eclipse.winery.model.tosca.TDeploymentArtifact;
-import org.eclipse.winery.model.tosca.TDeploymentArtifacts;
-import org.eclipse.winery.model.tosca.TEntityTemplate;
 import org.eclipse.winery.model.tosca.TExtensibleElements;
-import org.eclipse.winery.model.tosca.TImplementationArtifact;
-import org.eclipse.winery.model.tosca.TImplementationArtifacts;
-import org.eclipse.winery.model.tosca.TNodeTemplate;
-import org.eclipse.winery.model.tosca.TTopologyTemplate;
 import org.eclipse.winery.repository.backend.BackendUtils;
 import org.eclipse.winery.repository.backend.RepositoryFactory;
 import org.eclipse.winery.repository.datatypes.ids.elements.ArtifactTemplateDirectoryId;
 import org.eclipse.winery.repository.datatypes.ids.elements.ArtifactTemplateFilesDirectoryId;
 import org.eclipse.winery.repository.datatypes.ids.elements.ArtifactTemplateSrcDirectoryId;
 import org.eclipse.winery.repository.rest.RestUtils;
 import org.eclipse.winery.repository.rest.resources.AbstractComponentInstanceWithReferencesResource;
-import org.eclipse.winery.repository.rest.resources.AbstractComponentsResource;
 import org.eclipse.winery.repository.rest.resources.IHasName;
 import org.eclipse.winery.repository.rest.resources.entitytemplates.IEntityTemplateResource;
 import org.eclipse.winery.repository.rest.resources.entitytemplates.PropertiesResource;
 import org.eclipse.winery.repository.rest.resources.entitytemplates.TEntityTemplateResource;
-import org.eclipse.winery.repository.rest.resources.entitytypeimplementations.nodetypeimplementations.NodeTypeImplementationResource;
-import org.eclipse.winery.repository.rest.resources.entitytypeimplementations.relationshiptypeimplementations.RelationshipTypeImplementationResource;
 import org.eclipse.winery.repository.rest.resources.entitytypes.artifacttypes.ArtifactTypeResource;
-import org.eclipse.winery.repository.rest.resources.servicetemplates.ServiceTemplateResource;
 
 /**
  * Models an Artifact Template with its artifact references
@@ -145,86 +126,6 @@ public PropertiesResource getPropertiesResource() {
 		return new PropertiesResource(this.getTArtifactTemplate(), this);
 	}
 
-	/**
-	 * TODO: This should moved to org.eclipse.winery.repository
-	 */
-	int getReferenceCount() {
-		// We do not use a database, therefore, we have to go through all possibilities pointing to the artifact template
-		// DAs and IAs point to an artifact template
-		// DAs are contained in Node Type Implementations and Node Templates
-		// IAs are contained in Node Type Implementations and Relationship Type Implementations
-
-		int count = 0;
-
-		Collection<TDeploymentArtifact> allDAs = new HashSet<>();
-		Collection<TImplementationArtifact> allIAs = new HashSet<>();
-
-		// handle Node Type Implementation, which contains DAs and IAs
-		SortedSet<NodeTypeImplementationId> nodeTypeImplementations = RepositoryFactory.getRepository().getAllDefinitionsChildIds(NodeTypeImplementationId.class);
-		for (NodeTypeImplementationId ntiId : nodeTypeImplementations) {
-			NodeTypeImplementationResource ntiRes = (NodeTypeImplementationResource) AbstractComponentsResource.getComponentInstaceResource(ntiId);
-			TDeploymentArtifacts deploymentArtifacts = ntiRes.getNTI().getDeploymentArtifacts();
-			if (deploymentArtifacts != null) {
-				allDAs.addAll(deploymentArtifacts.getDeploymentArtifact());
-			}
-			TImplementationArtifacts implementationArtifacts = ntiRes.getNTI().getImplementationArtifacts();
-			if (implementationArtifacts != null) {
-				allIAs.addAll(implementationArtifacts.getImplementationArtifact());
-			}
-		}
-
-		// check all Relationshiptype Implementations for IAs
-		SortedSet<RelationshipTypeImplementationId> relationshipTypeImplementations = RepositoryFactory.getRepository().getAllDefinitionsChildIds(RelationshipTypeImplementationId.class);
-		for (RelationshipTypeImplementationId rtiId : relationshipTypeImplementations) {
-			RelationshipTypeImplementationResource rtiRes = (RelationshipTypeImplementationResource) AbstractComponentsResource.getComponentInstaceResource(rtiId);
-			TImplementationArtifacts implementationArtifacts = rtiRes.getRTI().getImplementationArtifacts();
-			if (implementationArtifacts != null) {
-				allIAs.addAll(implementationArtifacts.getImplementationArtifact());
-			}
-		}
-
-		// check all node templates for DAs
-		SortedSet<ServiceTemplateId> serviceTemplates = RepositoryFactory.getRepository().getAllDefinitionsChildIds(ServiceTemplateId.class);
-		for (ServiceTemplateId sid : serviceTemplates) {
-			ServiceTemplateResource serviceTemplateRes = (ServiceTemplateResource) AbstractComponentsResource.getComponentInstaceResource(sid);
-			TTopologyTemplate topologyTemplate = serviceTemplateRes.getServiceTemplate().getTopologyTemplate();
-			if (topologyTemplate != null) {
-				List<TEntityTemplate> nodeTemplateOrRelationshipTemplate = topologyTemplate.getNodeTemplateOrRelationshipTemplate();
-				for (TEntityTemplate template : nodeTemplateOrRelationshipTemplate) {
-					if (template instanceof TNodeTemplate) {
-						TNodeTemplate nodeTemplate = (TNodeTemplate) template;
-						TDeploymentArtifacts deploymentArtifacts = nodeTemplate.getDeploymentArtifacts();
-						if (deploymentArtifacts != null) {
-							allDAs.addAll(deploymentArtifacts.getDeploymentArtifact());
-						}
-					}
-				}
-			}
-		}
-
-		// now we have all DAs and IAs
-
-		QName ourQName = this.getQName();
-
-		// check DAs for artifact templates
-		for (TDeploymentArtifact da : allDAs) {
-			QName artifactRef = da.getArtifactRef();
-			if (ourQName.equals(artifactRef)) {
-				count++;
-			}
-		}
-
-		// check IAs for artifact templates
-		for (TImplementationArtifact ia : allIAs) {
-			QName artifactRef = ia.getArtifactRef();
-			if (ourQName.equals(artifactRef)) {
-				count++;
-			}
-		}
-
-		return count;
-	}
-
 	/**
 	 * Query parameter {@code type}:<br /> Returns the type of the artifact template
 	 *
@@ -238,7 +139,7 @@ int getReferenceCount() {
 	@Produces(MediaType.TEXT_PLAIN)
 	public Response getReferenceCount(@QueryParam("referenceCount") String referenceCount, @QueryParam("type") String type) {
 		if (referenceCount != null) {
-			String res = Integer.toString(this.getReferenceCount());
+			String res = Integer.toString(RepositoryFactory.getRepository().getReferenceCount((ArtifactTemplateId) this.id));
 			return Response.ok().entity(res).build();
 		} else if (type != null) {
 			String res = ((HasType) this.getElement()).getTypeAsQName().toString();

diff --git a/...sitory/rest/resources/entitytemplates/artifacttemplates/ArtifactTemplateResourceTest.java b/...sitory/rest/resources/entitytemplates/artifacttemplates/ArtifactTemplateResourceTest.java
@@ -14,25 +14,13 @@
 
 import java.nio.file.Path;
 
-import org.eclipse.winery.common.ids.definitions.ArtifactTemplateId;
-import org.eclipse.winery.repository.rest.resources.AbstractComponentsResource;
 import org.eclipse.winery.repository.rest.resources.AbstractResourceTest;
 
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
-import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ArtifactTemplateResourceTest extends AbstractResourceTest {
 
-	@Test
-	@Ignore
-	public void countMatches() {
-		ArtifactTemplateId id = new ArtifactTemplateId("http%3A%2F%2Fdocs.oasis-open.org%2Ftosca%2Fns%2F2011%2F12%2FToscaSpecificTypes", "at-0cd9ab5d-6c2e-4fc2-9cb0-3fee1e431f9f", true);
-		ArtifactTemplateResource res = (ArtifactTemplateResource) AbstractComponentsResource.getComponentInstaceResource(id);
-		Assert.assertEquals(1, res.getReferenceCount());
-	}
-
 	@Test
 	public void getSourceZip() throws Exception {
 		this.setRevisionTo("88e5ccd6c35aeffdebc19c8dda9cd76f432538f8");

diff --git a/...y.repository/src/main/java/org/eclipse/winery/repository/TestWithGitBackedRepository.java b/...y.repository/src/main/java/org/eclipse/winery/repository/TestWithGitBackedRepository.java
@@ -29,6 +29,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * This class resides in the main package and not in test, because other modules (such as the REST module) also rely on this test class.
+ */
 public abstract class TestWithGitBackedRepository {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(TestWithGitBackedRepository.class);

diff --git a/...ry.repository/src/main/java/org/eclipse/winery/repository/backend/IGenericRepository.java b/...ry.repository/src/main/java/org/eclipse/winery/repository/backend/IGenericRepository.java
@@ -76,6 +76,7 @@
 import org.eclipse.winery.model.tosca.TRequirementDefinition;
 import org.eclipse.winery.model.tosca.TRequirementType;
 import org.eclipse.winery.model.tosca.TServiceTemplate;
+import org.eclipse.winery.model.tosca.TTopologyTemplate;
 import org.eclipse.winery.repository.backend.xsd.XsdImportManager;
 import org.eclipse.winery.repository.exceptions.RepositoryCorruptException;
 import org.eclipse.winery.repository.exceptions.WineryRepositoryException;
@@ -263,7 +264,7 @@ default <X extends DefinitionsChildId> Collection<X> getAllElementsReferencingGi
 
 		// we do not use any database system,
 		// therefore we have to crawl through each node type implementation by ourselves
-		return RepositoryFactory.getRepository().getAllDefinitionsChildIds(clazz)
+		return this.getAllDefinitionsChildIds(clazz)
 			.stream()
 			// The resource may have been freshly initialized due to existence of a directory
 			// then it has no node type assigned leading to ntiRes.getType() being null
@@ -622,4 +623,80 @@ default void setElement(DefinitionsChildId id, TExtensibleElements element) thro
 		definitions.setElement(element);
 		BackendUtils.persist(id, definitions);
 	}
+
+	default int getReferenceCount(ArtifactTemplateId id) {
+		// We do not use a database, therefore, we have to go through all possibilities pointing to the artifact template
+		// DAs and IAs point to an artifact template
+		// DAs are contained in Node Type Implementations and Node Templates
+		// IAs are contained in Node Type Implementations and Relationship Type Implementations
+
+		int count = 0;
+
+		Collection<TDeploymentArtifact> allDAs = new HashSet<>();
+		Collection<TImplementationArtifact> allIAs = new HashSet<>();
+
+		// handle Node Type Implementation, which contains DAs and IAs
+		SortedSet<NodeTypeImplementationId> nodeTypeImplementations = this.getAllDefinitionsChildIds(NodeTypeImplementationId.class);
+		for (NodeTypeImplementationId ntiId : nodeTypeImplementations) {
+			final TNodeTypeImplementation nodeTypeImplementation = this.getElement(ntiId);
+			TDeploymentArtifacts deploymentArtifacts = nodeTypeImplementation.getDeploymentArtifacts();
+			if (deploymentArtifacts != null) {
+				allDAs.addAll(deploymentArtifacts.getDeploymentArtifact());
+			}
+			TImplementationArtifacts implementationArtifacts = nodeTypeImplementation.getImplementationArtifacts();
+			if (implementationArtifacts != null) {
+				allIAs.addAll(implementationArtifacts.getImplementationArtifact());
+			}
+		}
+
+		// check all Relationshiptype Implementations for IAs
+		SortedSet<RelationshipTypeImplementationId> relationshipTypeImplementations = this.getAllDefinitionsChildIds(RelationshipTypeImplementationId.class);
+		for (RelationshipTypeImplementationId rtiId : relationshipTypeImplementations) {
+			TImplementationArtifacts implementationArtifacts = this.getElement(rtiId).getImplementationArtifacts();
+			if (implementationArtifacts != null) {
+				allIAs.addAll(implementationArtifacts.getImplementationArtifact());
+			}
+		}
+
+		// check all node templates for DAs
+		SortedSet<ServiceTemplateId> serviceTemplates = this.getAllDefinitionsChildIds(ServiceTemplateId.class);
+		for (ServiceTemplateId sid : serviceTemplates) {
+			TTopologyTemplate topologyTemplate = this.getElement(sid).getTopologyTemplate();
+			if (topologyTemplate != null) {
+				List<TEntityTemplate> nodeTemplateOrRelationshipTemplate = topologyTemplate.getNodeTemplateOrRelationshipTemplate();
+				for (TEntityTemplate template : nodeTemplateOrRelationshipTemplate) {
+					if (template instanceof TNodeTemplate) {
+						TNodeTemplate nodeTemplate = (TNodeTemplate) template;
+						TDeploymentArtifacts deploymentArtifacts = nodeTemplate.getDeploymentArtifacts();
+						if (deploymentArtifacts != null) {
+							allDAs.addAll(deploymentArtifacts.getDeploymentArtifact());
+						}
+					}
+				}
+			}
+		}
+
+		// now we have all DAs and IAs
+
+		QName ourQName = id.getQName();
+
+		// check DAs for artifact templates
+		for (TDeploymentArtifact da : allDAs) {
+			QName artifactRef = da.getArtifactRef();
+			if (ourQName.equals(artifactRef)) {
+				count++;
+			}
+		}
+
+		// check IAs for artifact templates
+		for (TImplementationArtifact ia : allIAs) {
+			QName artifactRef = ia.getArtifactRef();
+			if (ourQName.equals(artifactRef)) {
+				count++;
+			}
+		}
+
+		return count;
+	}
+
 }
diff --git a/...rc/test/java/org/eclipse/winery/repository/backend/filebased/FilebasedRepositoryTest.java b/...rc/test/java/org/eclipse/winery/repository/backend/filebased/FilebasedRepositoryTest.java
@@ -12,6 +12,7 @@
 
 import java.util.SortedSet;
 
+import org.eclipse.winery.common.ids.definitions.ArtifactTemplateId;
 import org.eclipse.winery.common.ids.definitions.NodeTypeId;
 import org.eclipse.winery.common.ids.definitions.imports.XSDImportId;
 import org.eclipse.winery.repository.TestWithGitBackedRepository;
@@ -37,4 +38,12 @@ public void namespaceWithSpaceAtEndWorks() throws Exception {
 		Assert.assertTrue(this.repository.exists(id));
 		Assert.assertNotNull(this.repository.getElement(id));
 	}
+
+	@Test
+	public void referenceCountIsOneForBaobab() throws Exception {
+		this.setRevisionTo("5b7f106ab79a9ba137ece9167a79753dfc64ac84");
+		final ArtifactTemplateId artifactTemplateId = new ArtifactTemplateId("http://winery.opentosca.org/test/artifacttemplates/fruits", "baobab_bananaInterface_IA", false);
+		Assert.assertEquals(1, this.repository.getReferenceCount(artifactTemplateId));
+	}
+
 }