Removed support for Structurizr Express (which has now been discontin…

…ued).
structurizr · Jul 2, 2020 · 47f07f6 · 47f07f6
1 parent 4508e03
commit 47f07f6
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 112 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.structurizr.confluence</groupId>
  <artifactId>structurizr-confluence</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
  <organization>
  <name>Structurizr Limited</name>
  <url>https://structurizr.com</url>

diff --git a/src/main/java/com/structurizr/confluence/AbstractStructurizrMacro.java b/src/main/java/com/structurizr/confluence/AbstractStructurizrMacro.java
@@ -70,4 +70,4 @@ protected String getDiagramSelector(Map<String, String> parameters) {
  return diagramSelector;
  }
 
-}
+}
diff --git a/src/main/java/com/structurizr/confluence/StructurizrExpressEmbedMacro.java b/src/main/java/com/structurizr/confluence/StructurizrExpressEmbedMacro.java
diff --git a/src/main/java/com/structurizr/confluence/StructurizrWorkspaceEmbedMacro.java b/src/main/java/com/structurizr/confluence/StructurizrWorkspaceEmbedMacro.java
@@ -45,8 +45,8 @@ public String execute(Map<String, String> parameters, String bodyContent, Conver
  }
  }
 
- protected String createFormId(long workspaceId, String diagramKey) {
+ private String createFormId(long workspaceId, String diagramKey) {
  return String.format("structurizrEmbedForm_%d_%s", workspaceId, sanitizeElementIdPart(diagramKey));
  }
 
-}
+}
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
@@ -38,20 +38,6 @@
  </parameters>
  </xhtml-macro>
 
- <xhtml-macro name="structurizr-express"
- class="com.structurizr.confluence.StructurizrExpressEmbedMacro"
- documentation-url="https://www.structurizr.com/help/atlassian-confluence"
- icon="/download/resources/${project.groupId}.${project.artifactId}/images/structurizr-logo.png"
- key="structurizr-express">
- <category name="external-content" />
- <parameters>
- <parameter name="structurizrUrl" type="string" required="true" default="https://structurizr.com">
- <option key="showNameInPlaceholder" value="true" />
- <option key="showValueInPlaceholder" value="true" />
- </parameter>
- </parameters>
- </xhtml-macro>
-
  <!-- add our i18n resource -->
  <resource type="i18n" name="i18n" location="structurizr-confluence"/>
 

diff --git a/src/main/resources/structurizr-confluence.properties b/src/main/resources/structurizr-confluence.properties
@@ -10,10 +10,4 @@ com.structurizr.confluence.structurizr-confluence.structurizr-workspace.param.di
 com.structurizr.confluence.structurizr-confluence.structurizr-workspace.param.diagramSelector.label=Diagram selector
 com.structurizr.confluence.structurizr-confluence.structurizr-workspace.param.diagramSelector.desc=Include the diagram selector component.
 com.structurizr.confluence.structurizr-confluence.structurizr-workspace.param.structurizrUrl.label=Structurizr URL
-com.structurizr.confluence.structurizr-confluence.structurizr-workspace.param.structurizrUrl.desc=The URL of the Structurizr installation.
-
-# structurizr-express
-com.structurizr.confluence.structurizr-confluence.structurizr-express.label=Structurizr Express embed
-com.structurizr.confluence.structurizr-confluence.structurizr-express.desc=Embeds the Structurizr Express diagram defined in the macro body.
-com.structurizr.confluence.structurizr-confluence.structurizr-express.param.structurizrUrl.label=Structurizr URL
-com.structurizr.confluence.structurizr-confluence.structurizr-express.param.structurizrUrl.desc=The URL of the Structurizr installation.
+com.structurizr.confluence.structurizr-confluence.structurizr-workspace.param.structurizrUrl.desc=The URL of the Structurizr installation.
diff --git a/src/test/java/com/structurizr/confluence/StructurizrExpressEmbedMacroTests.java b/src/test/java/com/structurizr/confluence/StructurizrExpressEmbedMacroTests.java