Skip to content
This repository was archived by the owner on Jun 3, 2025. It is now read-only.

Enforce formatting pipeline #31

Merged
merged 3 commits into from
Apr 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ jobs:
maven-version: 3.9.6
- name: Build and Verify
run: mvn clean verify
- name: Check formatting
run: mvn spotless:check
- name: Publish Nightly Update Site
if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'DataFlowAnalysis'
uses: peaceiris/actions-gh-pages@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ private Term createTerm(String token) {

private String termToString(Term term, boolean isNested) {
if (term instanceof LabelReference labelReference) {
Label label = labelReference.getLabel();
return ((LabelType)label.eContainer()).getEntityName() + "." + label.getEntityName();
Label label = labelReference.getLabel();
return ((LabelType) label.eContainer()).getEntityName() + "." + label.getEntityName();
} else if (term instanceof TRUE) {
return "TRUE";
} else if (term instanceof AND and) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package org.dataflowanalysis.converter;

import com.fasterxml.jackson.databind.ObjectMapper;

import tools.mdsd.library.standalone.initialization.StandaloneInitializationException;
import tools.mdsd.library.standalone.initialization.StandaloneInitializerBuilder;

import java.io.File;
import java.io.IOException;
import java.util.Map;
Expand All @@ -17,6 +13,8 @@
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
import tools.mdsd.library.standalone.initialization.StandaloneInitializationException;
import tools.mdsd.library.standalone.initialization.StandaloneInitializerBuilder;

public abstract class Converter {
protected ObjectMapper objectMapper;
Expand All @@ -27,7 +25,7 @@ public abstract class Converter {
public Converter() {
objectMapper = new ObjectMapper();
}

/**
* Loads a data flow diagram and data dictionary from specified input files and returns them as a combined object.
* @param inputDataFlowDiagram The path of the input data flow diagram file.
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.lang.Process;

import org.dataflowanalysis.converter.microsecend.*;
import org.dataflowanalysis.dfd.datadictionary.*;
import org.dataflowanalysis.dfd.dataflowdiagram.*;
import org.dataflowanalysis.dfd.datadictionary.Assignment;
import org.dataflowanalysis.dfd.datadictionary.DataDictionary;
import org.dataflowanalysis.dfd.datadictionary.Label;
import org.dataflowanalysis.dfd.datadictionary.LabelType;
import org.dataflowanalysis.dfd.datadictionary.Pin;
import org.dataflowanalysis.dfd.datadictionary.datadictionaryFactory;
import org.dataflowanalysis.dfd.dataflowdiagram.DataFlowDiagram;
import org.dataflowanalysis.dfd.dataflowdiagram.Node;
import org.dataflowanalysis.dfd.dataflowdiagram.dataflowdiagramFactory;

/**
* Converts MicroSecEnd models to the data flow diagram and dictionary representation. Inherits from {@link Converter}
Expand Down
Loading