removed references to adapter

backend-diagram-converter/cli/src/main/java/org/camunda/community/migration/converter/cli/AbstractConvertCommand.java

@@ -32,9 +32,9 @@ public abstract class AbstractConvertCommand implements Callable<Integer> {
   boolean documentation;
 
   @Option(
-      names = {"--adapter-job-type"},
+      names = {"--default-job-type"},
       description = "If set, the default value for the adapter job is overridden")
-  String adapterJobType;
+  String defaultJobType;
 
   @Option(
       names = {"--prefix"},
@@ -62,9 +62,9 @@ public abstract class AbstractConvertCommand implements Callable<Integer> {
   boolean check;
 
   @Option(
-      names = "--disable-adapter",
-      description = "If enabled, the adapter job type will not be applied")
-  boolean adapterDisabled;
+      names = "--disable-default-job-type",
+      description = "If enabled, the default job type will not be applied")
+  boolean defaultJobTypeDisabled;
 
   public AbstractConvertCommand() {
     BpmnConverterFactory factory = BpmnConverterFactory.getInstance();
@@ -138,9 +138,9 @@ private BpmnDiagramCheckResult checkModel(Entry<File, BpmnModelInstance> modelIn
 
   protected DefaultConverterProperties converterProperties() {
     DefaultConverterProperties properties = new DefaultConverterProperties();
-    properties.setAdapterJobType(adapterJobType);
+    properties.setDefaultJobType(defaultJobType);
     properties.setPlatformVersion(platformVersion);
-    properties.setAdapterEnabled(!adapterDisabled);
+    properties.setDefaultJobTypeEnabled(!defaultJobTypeDisabled);
     properties.setAppendDocumentation(documentation);
     return properties;
   }

backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/ConverterProperties.java

@@ -6,7 +6,7 @@ public interface ConverterProperties {
 
   String getResultVariableHeader();
 
-  String getAdapterJobType();
+  String getDefaultJobType();
 
   String getScriptJobType();
 
@@ -16,7 +16,7 @@ public interface ConverterProperties {
 
   String getPlatformVersion();
 
-  Boolean getAdapterEnabled();
+  Boolean getDefaultJobTypeEnabled();
 
   Boolean getAppendDocumentation();
 }

backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/ConverterPropertiesFactory.java

@@ -41,7 +41,7 @@ public ConverterProperties merge(DefaultConverterProperties properties) {
   }
 
   private void readDefaultValues(DefaultConverterProperties properties) {
-    readZeebeJobType("adapter", properties::getAdapterJobType, properties::setAdapterJobType);
+    readZeebeJobType("default", properties::getDefaultJobType, properties::setDefaultJobType);
     readZeebeJobType("script", properties::getScriptJobType, properties::setScriptJobType);
     readZeebeHeader("script", properties::getScriptHeader, properties::setScriptHeader);
     readZeebeHeader(
@@ -53,7 +53,10 @@ private void readDefaultValues(DefaultConverterProperties properties) {
         "script-format", properties::getScriptFormatHeader, properties::setScriptFormatHeader);
     readZeebePlatformInfo(
         "version", properties::getPlatformVersion, properties::setPlatformVersion);
-    readFlag("adapter-enabled", properties::getAdapterEnabled, properties::setAdapterEnabled);
+    readFlag(
+        "default-job-type-enabled",
+        properties::getDefaultJobTypeEnabled,
+        properties::setDefaultJobTypeEnabled);
     readFlag(
         "append-documentation",
         properties::getAppendDocumentation,

backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/DefaultConverterProperties.java

@@ -3,12 +3,12 @@
 public class DefaultConverterProperties implements ConverterProperties {
   private String scriptHeader;
   private String resultVariableHeader;
-  private String adapterJobType;
+  private String defaultJobType;
   private String scriptJobType;
   private String resourceHeader;
   private String scriptFormatHeader;
   private String platformVersion;
-  private Boolean adapterEnabled;
+  private Boolean defaultJobTypeEnabled;
   private Boolean appendDocumentation;
 
   @Override
@@ -21,12 +21,12 @@ public void setAppendDocumentation(Boolean appendDocumentation) {
   }
 
   @Override
-  public Boolean getAdapterEnabled() {
-    return adapterEnabled;
+  public Boolean getDefaultJobTypeEnabled() {
+    return defaultJobTypeEnabled;
   }
 
-  public void setAdapterEnabled(Boolean adapterEnabled) {
-    this.adapterEnabled = adapterEnabled;
+  public void setDefaultJobTypeEnabled(Boolean defaultJobTypeEnabled) {
+    this.defaultJobTypeEnabled = defaultJobTypeEnabled;
   }
 
   @Override
@@ -57,12 +57,12 @@ public void setResultVariableHeader(String resultVariableHeader) {
   }
 
   @Override
-  public String getAdapterJobType() {
-    return adapterJobType;
+  public String getDefaultJobType() {
+    return defaultJobType;
   }
 
-  public void setAdapterJobType(String adapterJobType) {
-    this.adapterJobType = adapterJobType;
+  public void setDefaultJobType(String defaultJobType) {
+    this.defaultJobType = defaultJobType;
   }
 
   @Override

backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/message/MessageFactory.java

@@ -470,9 +470,10 @@ public static Message delegateImplementation(
             .build());
   }
 
-  public static Message delegateImplementationNoAdapter(String implementationType, String binding) {
+  public static Message delegateImplementationNoDefaultJobType(
+      String implementationType, String binding) {
     return INSTANCE.composeMessage(
-        "delegate-implementation-no-adapter",
+        "delegate-implementation-no-default-job-type",
         ContextBuilder.builder()
             .entry("implementationType", implementationType)
             .entry("binding", binding)

backend-diagram-converter/core/src/main/java/org/camunda/community/migration/converter/visitor/AbstractDelegateImplementationVisitor.java

@@ -16,7 +16,7 @@ public abstract class AbstractDelegateImplementationVisitor
 
   @Override
   protected Message visitSupportedAttribute(DomElementVisitorContext context, String attribute) {
-    if (context.getProperties().getAdapterEnabled()) {
+    if (context.getProperties().getDefaultJobTypeEnabled()) {
       context.addConversion(
           ServiceTaskConvertible.class,
           serviceTaskConversion ->
@@ -26,14 +26,14 @@ protected Message visitSupportedAttribute(DomElementVisitorContext context, Stri
           serviceTaskConversion ->
               serviceTaskConversion
                   .getZeebeTaskDefinition()
-                  .setType(context.getProperties().getAdapterJobType()));
+                  .setType(context.getProperties().getDefaultJobType()));
       return MessageFactory.delegateImplementation(
           attributeLocalName(),
           context.getElement().getLocalName(),
           attribute,
-          context.getProperties().getAdapterJobType());
+          context.getProperties().getDefaultJobType());
     } else {
-      return MessageFactory.delegateImplementationNoAdapter(attributeLocalName(), attribute);
+      return MessageFactory.delegateImplementationNoDefaultJobType(attributeLocalName(), attribute);
     }
   }
 

backend-diagram-converter/core/src/main/resources/converter-properties.properties

@@ -1,6 +1,6 @@
 # Zeebe Job Types
 ## Adapter
-zeebe-job-type.adapter=camunda-7-adapter
+zeebe-job-type.default=camunda-7-adapter
 ## Script
 zeebe-job-type.script=script
 # Zeebe Headers
@@ -15,7 +15,7 @@ zeebe-header.script-format=scriptFormat
 # Zeebe Meta Information
 zeebe-platform.version=8.2.0
 # Flags
-## Enable Adapter usage
-flag.adapter-enabled=true
+## Enable Default Job Type usage
+flag.default-job-type-enabled=true
 ## Append documentation
 flag.append-documentation=false

backend-diagram-converter/core/src/main/resources/message-templates.properties

@@ -124,8 +124,8 @@ form-key.severity=REVIEW
 delegate-implementation.message={{ templates.supported-attribute-prefix }} Delegate call to '{{ binding }}' was transformed to job type '{{ jobType }}'. Please review your implementation.
 delegate-implementation.severity=REVIEW
 #
-delegate-implementation-no-adapter.message=Delegate call of type '{{ implementationType }}' bound to '{{ binding }}' was reset.
-delegate-implementation-no-adapter.severity=INFO
+delegate-implementation-no-default-job-type.message=Delegate call of type '{{ implementationType }}' bound to '{{ binding }}' was reset.
+delegate-implementation-no-default-job-type.severity=INFO
 #
 script-job-type.message=Element '{{ elementLocalName }}' was transformed. Currently, script tasks are implemented like service tasks with job type '{{ jobType }}'. Please review your implementation.
 script-job-type.severity=REVIEW

backend-diagram-converter/core/src/test/java/org/camunda/community/migration/converter/BpmnConverterTest.java

@@ -410,7 +410,7 @@ void testErrorCodeShouldPersist() {
   @Test
   void testAdapterDisabled() {
     DefaultConverterProperties modified = new DefaultConverterProperties();
-    modified.setAdapterEnabled(false);
+    modified.setDefaultJobTypeEnabled(false);
     ConverterProperties properties = ConverterPropertiesFactory.getInstance().merge(modified);
     BpmnConverter converter = BpmnConverterFactory.getInstance().get();
     BpmnModelInstance modelInstance =

backend-diagram-converter/core/src/test/java/org/camunda/community/migration/converter/ConverterPropertiesTest.java

@@ -14,11 +14,11 @@ void shouldContainValues() {
   @Test
   void shouldMergeProperties() {
     DefaultConverterProperties properties = new DefaultConverterProperties();
-    properties.setAdapterJobType("adapter");
+    properties.setDefaultJobType("adapter");
     assertNull(properties.getResourceHeader());
     ConverterProperties converterProperties =
         ConverterPropertiesFactory.getInstance().merge(properties);
-    assertEquals("adapter", converterProperties.getAdapterJobType());
+    assertEquals("adapter", converterProperties.getDefaultJobType());
     assertNotNull(properties.getResourceHeader());
   }
 }

backend-diagram-converter/core/src/test/java/org/camunda/community/migration/converter/message/MessageFactoryTest.java

@@ -476,10 +476,10 @@ void shouldBuildEscalationCodeNoExpression() {
   }
 
   @Test
-  void shouldBuildDelegateImplementationNoAdapter() {
+  void shouldBuildDelegateImplementationNoDefaultJobType() {
     String implementationType = random();
     String binding = random();
-    Message message = delegateImplementationNoAdapter(implementationType, binding);
+    Message message = delegateImplementationNoDefaultJobType(implementationType, binding);
     assertNotNull(message);
     assertNotNull(message.getMessage());
     assertNotNull(message.getSeverity());

backend-diagram-converter/webapp/src/main/java/org/camunda/community/migration/converter/webapp/BpmnConverterService.java

@@ -25,13 +25,13 @@ public BpmnConverterService(BpmnConverter bpmnConverter) {
   public void convert(
       BpmnModelInstance modelInstance,
       boolean appendDocumentation,
-      String adapterJobType,
+      String defaultJobType,
       String platformVersion,
-      Boolean adapterEnabled) {
+      Boolean defaultJobTypeEnabled) {
     DefaultConverterProperties adaptedProperties = new DefaultConverterProperties();
-    adaptedProperties.setAdapterJobType(adapterJobType);
+    adaptedProperties.setDefaultJobType(defaultJobType);
     adaptedProperties.setPlatformVersion(platformVersion);
-    adaptedProperties.setAdapterEnabled(adapterEnabled);
+    adaptedProperties.setDefaultJobTypeEnabled(defaultJobTypeEnabled);
     adaptedProperties.setAppendDocumentation(appendDocumentation);
     bpmnConverter.convert(
         modelInstance, ConverterPropertiesFactory.getInstance().merge(adaptedProperties));
@@ -40,13 +40,13 @@ public void convert(
   public BpmnDiagramCheckResult check(
       String filename,
       BpmnModelInstance modelInstance,
-      String adapterJobType,
+      String defaultJobType,
       String platformVersion,
-      Boolean adapterEnabled) {
+      Boolean defaultJobTypeEnabled) {
     DefaultConverterProperties adaptedProperties = new DefaultConverterProperties();
-    adaptedProperties.setAdapterJobType(adapterJobType);
+    adaptedProperties.setDefaultJobType(defaultJobType);
     adaptedProperties.setPlatformVersion(platformVersion);
-    adaptedProperties.setAdapterEnabled(adapterEnabled);
+    adaptedProperties.setDefaultJobTypeEnabled(defaultJobTypeEnabled);
     return bpmnConverter.check(
         filename, modelInstance, ConverterPropertiesFactory.getInstance().merge(adaptedProperties));
   }

backend-diagram-converter/webapp/src/main/java/org/camunda/community/migration/converter/webapp/ConverterController.java

@@ -42,19 +42,19 @@ public ConverterController(BpmnConverterService bpmnConverter, BuildProperties b
       consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
   public ResponseEntity<?> check(
       @RequestParam("file") MultipartFile bpmnFile,
-      @RequestParam(value = "adapterJobType", required = false) String adapterJobType,
+      @RequestParam(value = "defaultJobType", required = false) String defaultJobType,
       @RequestParam(value = "platformVersion", required = false) String platformVersion,
-      @RequestParam(value = "adapterEnabled", required = false, defaultValue = "true")
-          Boolean adapterEnabled,
+      @RequestParam(value = "defaultJobTypeEnabled", required = false, defaultValue = "true")
+          Boolean defaultJobTypeEnabled,
       @RequestHeader(HttpHeaders.ACCEPT) String[] contentType) {
     try (InputStream in = bpmnFile.getInputStream()) {
       BpmnDiagramCheckResult diagramCheckResult =
           bpmnConverter.check(
               bpmnFile.getOriginalFilename(),
               Bpmn.readModelFromStream(in),
-              adapterJobType,
+              defaultJobType,
               platformVersion,
-              adapterEnabled);
+              defaultJobTypeEnabled);
       if (contentType == null
           || contentType.length == 0
           || Arrays.asList(contentType).contains(MediaType.APPLICATION_JSON_VALUE)) {
@@ -88,14 +88,18 @@ public ResponseEntity<?> getFile(
       @RequestParam("file") MultipartFile bpmnFile,
       @RequestParam(value = "appendDocumentation", required = false, defaultValue = "false")
           Boolean appendDocumentation,
-      @RequestParam(value = "adapterJobType", required = false) String adapterJobType,
+      @RequestParam(value = "defaultJobType", required = false) String defaultJobType,
       @RequestParam(value = "platformVersion", required = false) String platformVersion,
-      @RequestParam(value = "adapterEnabled", required = false, defaultValue = "true")
-          Boolean adapterEnabled) {
+      @RequestParam(value = "defaultJobTypeEnabled", required = false, defaultValue = "true")
+          Boolean defaultJobTypeEnabled) {
     try (InputStream in = bpmnFile.getInputStream()) {
       BpmnModelInstance modelInstance = Bpmn.readModelFromStream(in);
       bpmnConverter.convert(
-          modelInstance, appendDocumentation, adapterJobType, platformVersion, adapterEnabled);
+          modelInstance,
+          appendDocumentation,
+          defaultJobType,
+          platformVersion,
+          defaultJobTypeEnabled);
       String bpmnXml = bpmnConverter.printXml(modelInstance.getDocument(), true);
       Resource file = new ByteArrayResource(bpmnXml.getBytes());
       return ResponseEntity.ok()

backend-diagram-converter/webapp/src/main/resources/static/index.html

@@ -105,11 +105,11 @@ <h6>Legal disclaimer</h6>
           <input
                   class="form-check-input"
                   type="checkbox"
-                  id="adapterEnabled"
+                  id="defaultJobTypeEnabled"
                   checked
           />
-          <label for="adapterEnabled" class="form-check-label"
-          >Enable Adapter job type usage</label
+          <label for="defaultJobTypeEnabled" class="form-check-label"
+          >Enable Default job type usage</label
           >
         </div>
         <div class="mb-3">

backend-diagram-converter/webapp/src/main/resources/static/lib/user-interaction.js

@@ -4,7 +4,7 @@ const downloadCsv = document.getElementById("downloadCsv");
 
 const fileUpload = document.getElementById("formFile");
 const appendDocumentation = document.getElementById("appendDocumentation");
-const adapterEnabled = document.getElementById("adapterEnabled");
+const defaultJobTypeEnabled = document.getElementById("defaultJobTypeEnabled");
 
 const resultArea = document.getElementById("checkResults");
 const arrangedResultsArea = document.getElementById("arrangedResults");
@@ -74,7 +74,7 @@ const createFormData = async () => {
   }
   formData.append("file", fileUpload.files[0]);
   formData.append("appendDocumentation", appendDocumentation.checked);
-  formData.append("adapterEnabled",adapterEnabled.checked)
+  formData.append("defaultJobTypeEnabled", defaultJobTypeEnabled.checked)
   return formData;
 };
 const createFormattedResultWrapper = (file) => {