Skip to content

Commit 32ea546

Browse files
baptistegrimaudbaptistegrimaud
committed
ci: Demo Checkstyle in static analysis
1 parent dc3773b commit 32ea546

3 files changed

Lines changed: 79 additions & 80 deletions

File tree

‎.github/workflows/on-code-change.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: jahia/jahia-modules-action/static-analysis@v2
21+
- uses: jahia/jahia-modules-action/static-analysis@add-checkstyle-to-static-analysis-github-action
2222
with:
2323
node_version: 20
2424
yarn_version: 4.7.0
2525
yarn_test_version: 4.7.0
2626
auditci_level: critical
27-
27+
github_token: ${{ secrets.GH_API_TOKEN }}
2828
build:
2929
name: Build Module
3030
runs-on: self-hosted

‎javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/JavascriptModuleListener.java‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -38,80 +38,80 @@
3838
*/
3939
@Component(immediate = true)
4040
public class JavascriptModuleListener implements BundleListener {
41-
private static final Logger logger = LoggerFactory.getLogger(JavascriptModuleListener.class);
42-
private GraalVMEngine engine;
43-
private final Queue<Registrar> registrars = new ConcurrentLinkedQueue<>();
44-
45-
@Reference(cardinality = ReferenceCardinality.MANDATORY)
46-
public void setEngine(GraalVMEngine engine) {
47-
this.engine = engine;
48-
}
49-
50-
@Reference(service = Registrar.class, policy = ReferencePolicy.DYNAMIC, cardinality = ReferenceCardinality.MULTIPLE, policyOption = ReferencePolicyOption.GREEDY)
51-
public void addRegistrar(Registrar registrar) {
52-
for (Bundle bundle : getJavascriptModules()) {
53-
registrar.register(bundle);
54-
}
55-
56-
registrars.add(registrar);
57-
}
58-
59-
public void removeRegistrar(Registrar registrar) {
60-
registrars.remove(registrar);
61-
62-
for (Bundle bundle : getJavascriptModules()) {
63-
registrar.unregister(bundle);
64-
}
65-
}
66-
67-
@Activate
68-
public void activate(BundleContext context) {
69-
for (Bundle bundle : getJavascriptModules()) {
70-
engine.enableJavascriptModule(bundle);
71-
}
72-
73-
context.addBundleListener(this);
74-
}
75-
76-
@Deactivate
77-
public void deactivate(BundleContext context) {
78-
context.removeBundleListener(this);
79-
80-
for (Bundle bundle : getJavascriptModules()) {
81-
engine.disableJavascriptModule(bundle);
82-
}
83-
}
84-
85-
@Override
86-
public void bundleChanged(BundleEvent event) {
87-
try {
88-
Bundle bundle = event.getBundle();
89-
if (isJavascriptModule(bundle)) {
90-
if (event.getType() == BundleEvent.STARTED) {
91-
engine.enableJavascriptModule(bundle);
92-
for (Registrar registrar : registrars) {
93-
registrar.register(bundle);
94-
}
95-
} else if (event.getType() == BundleEvent.STOPPED) {
96-
for (Registrar registrar : registrars) {
97-
registrar.unregister(bundle);
98-
}
99-
engine.disableJavascriptModule(bundle);
100-
}
101-
}
102-
} catch (Exception e) {
103-
logger.error("Cannot handle event {}", event.toString(), e);
104-
}
105-
}
106-
107-
public List<Bundle> getJavascriptModules() {
108-
return Arrays.stream(engine.getBundleContext().getBundles())
109-
.filter(bundle -> bundle.getState() == Bundle.ACTIVE && isJavascriptModule(bundle))
110-
.collect(Collectors.toList());
111-
}
112-
113-
public boolean isJavascriptModule(Bundle bundle) {
114-
return bundle.getBundleId() != engine.getBundleContext().getBundle().getBundleId() &&
115-
bundle.getHeaders().get(BUNDLE_HEADER_JAVASCRIPT_INIT_SCRIPT) != null;
116-
}
41+
private static final Logger logger = LoggerFactory.getLogger(JavascriptModuleListener.class);
42+
private GraalVMEngine engine;
43+
private final Queue<Registrar> registrars = new ConcurrentLinkedQueue<>();
44+
45+
@Reference(cardinality = ReferenceCardinality.MANDATORY)
46+
public void setEngine(GraalVMEngine engine) {
47+
this.engine = engine;
48+
}
49+
50+
@Reference(service = Registrar.class, policy = ReferencePolicy.DYNAMIC, cardinality = ReferenceCardinality.MULTIPLE, policyOption = ReferencePolicyOption.GREEDY)
51+
public void addRegistrar(Registrar registrar) {
52+
for (Bundle bundle : getJavascriptModules()) {
53+
registrar.register(bundle);
54+
}
55+
56+
registrars.add(registrar);
57+
}
58+
59+
public void removeRegistrar(Registrar registrar) {
60+
registrars.remove(registrar);
61+
62+
for (Bundle bundle : getJavascriptModules()) {
63+
registrar.unregister(bundle);
64+
}
65+
}
66+
67+
@Activate
68+
public void activate(BundleContext context) {
69+
for (Bundle bundle : getJavascriptModules()) {
70+
engine.enableJavascriptModule(bundle);
71+
}
72+
73+
context.addBundleListener(this);
74+
}
75+
76+
@Deactivate
77+
public void deactivate(BundleContext context) {
78+
context.removeBundleListener(this);
79+
80+
for (Bundle bundle : getJavascriptModules()) {
81+
engine.disableJavascriptModule(bundle);
82+
}
83+
}
84+
85+
@Override
86+
public void bundleChanged(BundleEvent event) {
87+
try {
88+
Bundle bundle = event.getBundle();
89+
if (isJavascriptModule(bundle)) {
90+
if (event.getType() == BundleEvent.STARTED) {
91+
engine.enableJavascriptModule(bundle);
92+
for (Registrar registrar : registrars) {
93+
registrar.register(bundle);
94+
}
95+
} else if (event.getType() == BundleEvent.STOPPED) {
96+
for (Registrar registrar : registrars) {
97+
registrar.unregister(bundle);
98+
}
99+
engine.disableJavascriptModule(bundle);
100+
}
101+
}
102+
} catch (Exception e) {
103+
logger.error("Cannot handle event {}", event.toString(), e);
104+
}
105+
}
106+
107+
public List<Bundle> getJavascriptModules() {
108+
return Arrays.stream(engine.getBundleContext().getBundles())
109+
.filter(bundle -> bundle.getState() == Bundle.ACTIVE && isJavascriptModule(bundle))
110+
.collect(Collectors.toList());
111+
}
112+
113+
public boolean isJavascriptModule(Bundle bundle) {
114+
return bundle.getBundleId() != engine.getBundleContext().getBundle().getBundleId() &&
115+
bundle.getHeaders().get(BUNDLE_HEADER_JAVASCRIPT_INIT_SCRIPT) != null;
116+
}
117117
}

‎javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jshandler/JavascriptProtocolConnection.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ else if (packageRelativePath.equals("settings/template-thumbnail.png")) {
116116
jos.putNextEntry(new ZipEntry("images/template-preview/" + StringUtils.substringAfter(packageRelativePath, "settings/")));
117117
}
118118
// Map everything else in settings/ to META-INF/
119-
else {
119+
else
120120
jos.putNextEntry(new ZipEntry("META-INF/" + StringUtils.substringAfter(packageRelativePath, "settings/")));
121-
}
122121
} else if (packageRelativePath.startsWith("components") && packageRelativePath.endsWith(".png")) {
123122
String[] parts = StringUtils.split(packageRelativePath, "/");
124123
String nodeTypeName = parts[2];

0 commit comments

Comments
 (0)