Skip to content

fix for yml file #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IT22356086 merged 1 commit into from
Mar 9, 2026
Merged

fix for yml file #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions ...x-core/src/main/java/org/fractalx/core/generator/admin/AdminDataConsistencyGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ private void generateDataConsistencyController(Path pkg, List<FractalModule> mod
String schemas = (m.getOwnedSchemas() != null && !m.getOwnedSchemas().isEmpty())
? String.join(", ", m.getOwnedSchemas()) : "default";
dbChecks.append(String.format(
" {Map<String,Object> db = new LinkedHashMap<>(); db.put(\"service\",\"%s\"); db.put(\"schemas\",\"%s\"); db.put(\"health\", fetchDbHealth(%d)); db.put(\"dbSummary\", fetchDbSummary(%d)); dbList.add(db);}\n",
svcName, schemas, port, port));
" {Map<String,Object> db = new LinkedHashMap<>(); db.put(\"service\",\"%s\"); db.put(\"schemas\",\"%s\"); db.put(\"health\", fetchDbHealth(%d)); dbList.add(db);}\n",
svcName, schemas, port));
}

// Append saga-orchestrator DB — read from generated YAML, fall back to known defaults
Expand All @@ -203,8 +203,6 @@ private void generateDataConsistencyController(Path pkg, List<FractalModule> mod
" db.put(\"service\",\"saga-orchestrator\");" +
" db.put(\"schemas\",\"saga_instance\");" +
" db.put(\"health\", fetchDbHealth(SAGA_ORCHESTRATOR_PORT));" +
" db.put(\"instanceCount\", fetchSagaInstanceCount());" +
" db.put(\"dbSummary\", fetchDbSummary(SAGA_ORCHESTRATOR_PORT));" +
" dbList.add(db);}\n"
);

Expand Down
14 changes: 3 additions & 11 deletions fractalx-core/src/main/java/org/fractalx/core/generator/admin/AdminTemplateGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,10 +949,10 @@ private String buildSectionData() {
<div class="card-bd table-wrap">
<table class="table table-sm mb-0">
<thead><tr>
<th>Service</th><th>Schemas</th><th>Health</th><th>Row Count</th><th>Actions</th>
<th>Service</th><th>Schemas</th><th>Health</th><th>Actions</th>
</tr></thead>
<tbody id="databases-tbody">
<tr><td colspan="5" class="text-muted p-3">Loading…</td></tr>
<tr><td colspan="4" class="text-muted p-3">Loading…</td></tr>
</tbody>
</table>
</div>
Expand Down Expand Up @@ -1948,24 +1948,16 @@ function loadDataConsistency() {
tbody.innerHTML = '';
dbs.forEach(db => {
const h = db.health || 'UNKNOWN';
const summary = db.dbSummary;
let rowCount = '—';
if (summary && !summary.unavailable && summary.totalRows !== undefined) {
rowCount = summary.totalRows + ' rows';
} else if (db.instanceCount !== undefined && db.instanceCount >= 0) {
rowCount = db.instanceCount + ' rows';
}
tbody.innerHTML += `<tr>
<td>${db.service}</td>
<td><small>${db.schemas || '-'}</small></td>
<td><span class="badge ${h==='UP'?'badge-up':h==='DOWN'?'badge-down':'badge-unknown'} small">${h}</span></td>
<td class="text-muted small">${rowCount}</td>
<td><button class="btn btn-xs btn-outline-info" onclick="showDbDetails('${db.service}')">Details</button></td>
</tr>`;
});
}).catch(() => {
document.getElementById('databases-tbody').innerHTML =
'<tr><td colspan="5" class="text-muted">DB health unavailable</td></tr>';
'<tr><td colspan="4" class="text-muted">DB health unavailable</td></tr>';
});

fetch('/api/data/outbox')
Expand Down
39 changes: 39 additions & 0 deletions ...re/src/main/java/org/fractalx/core/generator/transformation/NetScopeClientWiringStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
import org.fractalx.core.model.FractalModule;
import com.github.javaparser.JavaParser;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.FieldDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.body.Parameter;
import com.github.javaparser.ast.body.VariableDeclarator;
import com.github.javaparser.ast.expr.FieldAccessExpr;
import com.github.javaparser.ast.expr.MethodCallExpr;
import com.github.javaparser.ast.expr.NameExpr;
import com.github.javaparser.ast.type.ClassOrInterfaceType;
import org.slf4j.Logger;
Expand All @@ -18,6 +21,8 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
* Rewires cross-module service references in copied source files so they point to
Expand Down Expand Up @@ -135,6 +140,40 @@ private void wireClientsInFile(Path javaFile, List<String> deps) throws IOExcept
}

if (modified) {
// Collect all *Client field names that were wired in this file
Set<String> clientFieldNames = deps.stream()
.map(beanType -> decapitalize(beanType + "Client"))
.collect(Collectors.toSet());

// For every concrete class in the file, add @Transactional to methods that
// call a wired *Client field but do not already have @Transactional.
for (ClassOrInterfaceDeclaration clazz : cu.findAll(ClassOrInterfaceDeclaration.class)) {
if (clazz.isInterface()) continue;

for (MethodDeclaration method : clazz.getMethods()) {
if (method.getBody().isEmpty()) continue; // abstract / native

boolean callsClient = method.findAll(MethodCallExpr.class).stream()
.anyMatch(call -> call.getScope()
.filter(scope -> scope instanceof NameExpr)
.map(scope -> clientFieldNames.contains(((NameExpr) scope).getNameAsString()))
.orElse(false));

if (!callsClient) continue;

boolean alreadyAnnotated = method.getAnnotations().stream()
.anyMatch(a -> a.getNameAsString().equals("Transactional")
|| a.getNameAsString().endsWith(".Transactional"));

if (!alreadyAnnotated) {
method.addAnnotation("Transactional");
cu.addImport("org.springframework.transaction.annotation.Transactional");
log.info("Added @Transactional to {}#{} in {}",
clazz.getNameAsString(), method.getNameAsString(), javaFile.getFileName());
}
}
}

Files.writeString(javaFile, cu.toString());
log.info("Wired NetScope client references in: {}", javaFile.getFileName());
}
Expand Down