Skip to content

Commit 1456b89

Browse files
committed
Tidy up more
1 parent b3f8177 commit 1456b89

File tree

3 files changed

+9
-41
lines changed

3 files changed

+9
-41
lines changed

core/src/main/java/eu/maveniverse/maven/heimdall/shared/SessionConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ public interface SessionConfig {
3636
String UNKNOWN_VERSION = "unknown";
3737

3838
/**
39-
* Configuration key in properties (system, user or project) to enable/disable Njord. Defaults to {@code true}.
39+
* Configuration key in properties (system, user or project) to enable/disable Heimdall. Defaults to {@code true}.
4040
*/
4141
String CONFIG_ENABLED = KEY_PREFIX + "enabled";
4242

4343
/**
44-
* Is Njord enabled? If this method returns {@code false}, Njord will step aside (like it was not loaded).
44+
* Is Heimdall enabled? If this method returns {@code false}, Heimdall will step aside (like it was not loaded).
4545
*/
4646
boolean enabled();
4747

4848
/**
49-
* Returns the Njord version.
49+
* Returns the Heimdall version.
5050
*/
5151
String version();
5252

5353
/**
54-
* Njord basedir, where all the config and locally staged repositories are.
54+
* Heimdall basedir, where all the config and locally staged repositories are.
5555
*/
5656
Path basedir();
5757

@@ -242,15 +242,15 @@ private Impl(
242242
? this.basedir.resolve("heimdall.properties")
243243
: FileUtils.canonicalPath(this.basedir.resolve(propertiesPath));
244244

245-
Properties njordProperties = new Properties();
245+
Properties heimdallProperties = new Properties();
246246
if (Files.isRegularFile(this.propertiesPath)) {
247247
try (InputStream inputStream = Files.newInputStream(this.propertiesPath)) {
248-
njordProperties.load(inputStream);
248+
heimdallProperties.load(inputStream);
249249
} catch (IOException e) {
250250
throw new UncheckedIOException(e);
251251
}
252252
}
253-
this.heimdallProperties = MavenUtils.toMap(njordProperties);
253+
this.heimdallProperties = MavenUtils.toMap(heimdallProperties);
254254
this.userProperties = J8Utils.copyOf(requireNonNull(userProperties, "userProperties"));
255255
this.systemProperties = J8Utils.copyOf(requireNonNull(systemProperties, "systemProperties"));
256256
HashMap<String, String> eff = new HashMap<>();

core/src/test/settings/smoke.xml

Lines changed: 0 additions & 32 deletions
This file was deleted.

extension/src/main/java/eu/maveniverse/maven/heimdall/extension3/HeimdallSessionLifecycleParticipant.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.LoggerFactory;
2929

3030
/**
31-
* Lifecycle participant that creates Njord session.
31+
* Lifecycle participant that creates Heimdall session.
3232
*/
3333
@Singleton
3434
@Named
@@ -72,7 +72,7 @@ public void afterSessionEnd(MavenSession session) throws MavenExecutionException
7272
try {
7373
Optional<Session> ns = SessionUtils.mayGetSession(session.getRepositorySession());
7474
if (ns.isPresent()) {
75-
try (Session njordSession = ns.orElseThrow(J8Utils.OET)) {
75+
try (Session heimdallSession = ns.orElseThrow(J8Utils.OET)) {
7676
// nothing
7777
}
7878
logger.info("Heimdall session closed");

0 commit comments

Comments
 (0)