add startVisit and endVisit methods to add handling of FileredView

README.md

@@ -18,7 +18,7 @@ You can use the archetype by running this maven-friendly 😅command.
 Current version is ![GitHub version](https://badge.fury.io/gh/Riduidel%2Faadarchi.svg)
 
 ```sh
-mvn archetype:generate -DarchetypeVersion=0.0.1 -Daadarchi-version=0.0.1 -DarchetypeGroupId=io.github.Riduidel.aadarchi -DarchetypeArtifactId=archetype 
+mvn archetype:generate -DarchetypeVersion=0.1.4 -Daadarchi-version=0.1.4 -DarchetypeGroupId=io.github.Riduidel.aadarchi -DarchetypeArtifactId=archetype 
 ```
 
 This will ask you a few questions and generate the project.

architecture-documentation/src/architecture/resources/workspace.dsl

@@ -2,7 +2,7 @@ workspace "aadarchi-documentation-system" {
 	model {
 		person_architect = person "Architect" "The architect as team scribe is the writer of this kind of documentation."
 		person_stakeholder = person "Stakeholder" "All project stakeholders are readers of this kind of documentation."
-		aadarchi = softwareSystem "Aadarchi" {
+		aadarchi = softwareSystem "Aadarchi" "auto-include" {
 			properties {
 				"aadarchi.tickets.project" "aadarchi-documentation-system"
 				"aadarchi.issue.manager" "https://github.com/Riduidel/aadarchi-documentation-system"
@@ -16,7 +16,7 @@ workspace "aadarchi-documentation-system" {
 				}
 				maven -> this "Invokes this plugin during build to generate data"
 			}
-			aadarchi_base = container "base" "" "Java, CDI" {
+			aadarchi_base = container "base" "" "Java, CDI" "auto-include" {
 				properties {
 					"aadarchi.sequence.generator.with" "true"
 				}
@@ -47,11 +47,13 @@ workspace "aadarchi-documentation-system" {
 		systemContext "aadarchi" "SystemContext" "Illustration of aadarchi-documentation usage" {
 			include *
 		}
-		container "aadarchi" "system_containers" "Agile architecture containers" {
+		container "aadarchi" "system_containers_source" "Agile architecture containers" {
 			include *
 		}
-		component "aadarchi_base" "base_components" "Agile architecture base components view" {
+		component "aadarchi_base" "base_components_source" "Agile architecture base components view" {
 			include *
 		}
+		filtered "system_containers_source" include "Element,Relationship,auto-include" "system_containers" "Agile architecture containers"
+		filtered "base_components_source" include "Element,Relationship,auto-include" "base_components" "Agile architecture base components view"
 	}
 }

architecture-documentation/src/docs/asciidoc/06-software_architecture/_Aadarchi_base.adoc

@@ -1,8 +1,8 @@
 == base components
 
-[plantuml, {plantumldir}base_components, svg, opts="inline"]     
+[plantuml, {plantumldir}base_components_source, svg, opts="inline"]
 ----
-include::{structurizrdir}/base_components.plantuml[]
+include::{structurizrdir}/base_components_source.plantuml[]
 ----
 
 == base interface

architecture-documentation/src/docs/asciidoc/_06-software_architecture.adoc

@@ -2,9 +2,9 @@
 :chapter: Software%20Architecture
 include::_notify-bug-admonition.adoc[]
 
-[plantuml, {plantumldir}system_containers, svg, opts="inline"]     
+[plantuml, {plantumldir}system_containers_source, svg, opts="inline"]
 ----
-include::{structurizrdir}/system_containers.plantuml[]
+include::{structurizrdir}/system_containers_source.plantuml[]
 ----
 
 **TODO**

base/src/main/java/org/ndx/aadarchi/base/ArchitectureEnhancer.java

@@ -13,9 +13,9 @@
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
+import com.structurizr.view.FilteredView;
 import org.apache.commons.lang3.time.StopWatch;
 import org.apache.deltaspike.core.api.config.ConfigProperty;
-import org.ndx.aadarchi.base.enhancers.ModelElementKeys;
 import org.ndx.aadarchi.base.enhancers.ModelElementKeys.ConfigProperties.EnhancementsDir;
 import org.ndx.aadarchi.base.utils.SimpleOutputBuilder;
 
@@ -125,6 +125,13 @@ private void enhancerVisitViews(ViewEnhancer enhancer, ViewSet viewset) {
 			views.filter(s -> withClassLoader(() -> enhancer.startVisit(s)))
 				.forEach(s -> withClassLoader(() -> enhancer.endVisit(s, outputBuilder)));
 			enhancer.endVisit(viewset, outputBuilder);
+
+			Stream<FilteredView> filteredViews = viewset.getFilteredViews().stream();
+			if (enhancer.isParallel())
+				filteredViews = filteredViews.parallel();
+			filteredViews.filter(s -> withClassLoader(() -> enhancer.startVisit(s)))
+					.forEach(s -> withClassLoader(() -> enhancer.endVisit(s, outputBuilder)));
+			enhancer.endVisit(viewset, outputBuilder);
 		}
 	}
 

base/src/main/java/org/ndx/aadarchi/base/ViewEnhancer.java

@@ -1,5 +1,6 @@
 package org.ndx.aadarchi.base;
 
+import com.structurizr.view.FilteredView;
 import com.structurizr.view.View;
 import com.structurizr.view.ViewSet;
 
@@ -8,7 +9,11 @@ public interface ViewEnhancer extends Enhancer {
 
 	boolean startVisit(View s);
 
+	boolean startVisit(FilteredView filteredView);
+
 	void endVisit(View s, OutputBuilder builder);
 
 	void endVisit(ViewSet viewset, OutputBuilder builder);
+
+	void endVisit(FilteredView filteredView, OutputBuilder builder);
 }

base/src/main/java/org/ndx/aadarchi/base/enhancers/ToDsl.java

@@ -12,6 +12,7 @@
 
 import javax.inject.Inject;
 
+import com.structurizr.view.*;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,12 +30,6 @@
 import com.structurizr.model.Person;
 import com.structurizr.model.Relationship;
 import com.structurizr.model.SoftwareSystem;
-import com.structurizr.view.ComponentView;
-import com.structurizr.view.ContainerView;
-import com.structurizr.view.SystemContextView;
-import com.structurizr.view.SystemLandscapeView;
-import com.structurizr.view.View;
-import com.structurizr.view.ViewSet;
 
 /**
  * Enhancer that generate a structurizr dsl file The dsl file is used to
@@ -243,6 +238,11 @@ public boolean startVisit(View s) {
 		return true;
 	}
 
+	@Override
+	public boolean startVisit(FilteredView filteredView) {
+		return true;
+	}
+
 	@Override
 	public void endVisit(View s, OutputBuilder builder) {
 		String PLACEHOLDER = "\t\t\tWARNING: Include and autolayout can't be infered from static view content, so you'll have to set that yourself\n\t\t}\n";
@@ -278,4 +278,9 @@ public void endVisit(View s, OutputBuilder builder) {
 	public void endVisit(ViewSet viewset, OutputBuilder builder) {
 		architecture += "\n";
 	}
+
+	@Override
+	public void endVisit(FilteredView filteredView, OutputBuilder builder) {
+		architecture += "\n";
+	}
 }

base/src/main/java/org/ndx/aadarchi/base/enhancers/ViewEnhancerAdapter.java

@@ -1,18 +1,10 @@
 package org.ndx.aadarchi.base.enhancers;
 
+import com.structurizr.view.*;
 import org.ndx.aadarchi.base.OutputBuilder;
 import org.ndx.aadarchi.base.ViewEnhancer;
 
 import com.structurizr.Workspace;
-import com.structurizr.view.ComponentView;
-import com.structurizr.view.ContainerView;
-import com.structurizr.view.CustomView;
-import com.structurizr.view.DeploymentView;
-import com.structurizr.view.DynamicView;
-import com.structurizr.view.SystemContextView;
-import com.structurizr.view.SystemLandscapeView;
-import com.structurizr.view.View;
-import com.structurizr.view.ViewSet;
 
 /**
  * The view enhancer adapter allow visiting all view, and provides detailed informations about the view type.
@@ -85,6 +77,15 @@ protected boolean startVisit(CustomView c) {
 		return false;
 	}
 
+	@Override
+	public boolean startVisit(FilteredView filteredView) {
+		return true;
+	}
+
+	@Override
+	public void endVisit(FilteredView filteredView, OutputBuilder builder) {
+	}
+
 	@Override
 	public void endVisit(View s, OutputBuilder builder) {
 		if (s instanceof CustomView) {

base/src/main/java/org/ndx/aadarchi/base/enhancers/graph/GraphEmitter.java

@@ -10,6 +10,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
+import com.structurizr.view.*;
 import org.apache.deltaspike.core.api.config.ConfigProperty;
 import org.ndx.aadarchi.base.OutputBuilder;
 import org.ndx.aadarchi.base.ViewEnhancer;
@@ -20,10 +21,6 @@
 import com.structurizr.Workspace;
 import com.structurizr.annotation.Component;
 import com.structurizr.export.plantuml.C4PlantUMLExporter;
-import com.structurizr.view.ComponentView;
-import com.structurizr.view.ContainerView;
-import com.structurizr.view.View;
-import com.structurizr.view.ViewSet;
 
 /**
  * Generates all graph and output them in the {@link #destination} folder
@@ -63,6 +60,9 @@ public int priority() {
 	@Override
 	public boolean startVisit(View s) { return true; }
 
+	@Override
+	public boolean startVisit(FilteredView filteredView) { return true; }
+
 	/**
 	 * At view end visit, we selectively remove the layout information if it is layout with legend
 	 */
@@ -78,6 +78,11 @@ public void endVisit(ViewSet viewset, OutputBuilder builder) {
 		logger.info(String.format("All views should have been output to %s", destination.getAbsolutePath()));
 	}
 
+	@Override
+	public void endVisit(FilteredView filteredView, OutputBuilder builder) {
+		logger.info(String.format("All views should have been output to %s", destination.getAbsolutePath()));
+	}
+
 	@Override
 	public boolean startVisit(Workspace workspace, OutputBuilder builder) {
 		writeAllViews(workspace);

base/src/main/java/org/ndx/aadarchi/base/enhancers/graph/ViewUpdater.java

@@ -0,0 +1,54 @@
+package org.ndx.aadarchi.base.enhancers.graph;
+
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import org.ndx.aadarchi.base.OutputBuilder;
+import org.ndx.aadarchi.base.enhancers.ViewEnhancerAdapter;
+
+import com.structurizr.view.ComponentView;
+import com.structurizr.view.ContainerView;
+import com.structurizr.view.FilteredView;
+import com.structurizr.view.View;
+import com.structurizr.view.ViewSet;
+
+
+public class ViewUpdater extends ViewEnhancerAdapter {
+	private static final String INCLUDE_TAG = "auto-include";
+	@Inject Logger logger;
+	@Override
+	public boolean isParallel() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public int priority() {
+		return TOP_PRIORITY_FOR_INTERNAL_ENHANCERS+1;
+	}
+
+	@Override
+	public boolean startVisit(FilteredView filteredView) {
+		return true;
+	}
+
+	@Override
+	public void endVisit(FilteredView filteredView, OutputBuilder builder) {
+		if(filteredView.getTags().contains(INCLUDE_TAG)) {
+			View source = filteredView.getView();
+			if(source instanceof ComponentView) {
+				((ComponentView) source).addAllComponents();
+			} else if(source instanceof ContainerView) {
+				((ContainerView) source).addAllContainersAndInfluencers();
+			}
+		}
+		super.endVisit(filteredView, builder);
+	}
+
+	public void endVisit(ViewSet v, OutputBuilder b) {
+		if(v.getFilteredViews().isEmpty()) {
+			logger.warning("There are no filtered views in viewset, so we don't add any discovered container/component");
+		}
+	}
+}