Add application settings

pcastornii · pcastornii · commit 1e4cdfc760fd · 2026-04-12T20:11:56.000+03:00
diff --git a/alpha-core/src/main/java/com/techsenger/alpha/core/api/ApplicationSettings.java b/alpha-core/src/main/java/com/techsenger/alpha/core/api/ApplicationSettings.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2018-2026 Pavel Castornii.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.techsenger.alpha.core.api;
+
+import com.techsenger.toolkit.core.version.Version;
+import java.util.Objects;
+
+/**
+ *
+ * @author Pavel Castornii
+ */
+public final class ApplicationSettings implements LayerOwner {
+
+    private String name;
+
+    private Version version;
+
+    private ApplicationSettings() {
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getFullName() {
+        return name + Constants.NAME_VERSION_SEPARATOR + version;
+    }
+
+    @Override
+    public Version getVersion() {
+        return version;
+    }
+
+    public static final class Builder {
+
+        private String name;
+
+        private Version version;
+
+        Builder() {
+
+        }
+
+        public Builder name(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public Builder version(Version version) {
+            this.version = version;
+            return this;
+        }
+
+        ApplicationSettings build() {
+            Objects.requireNonNull(this.name, "Application name is not set");
+            Objects.requireNonNull(this.version, "Application version is not set");
+            var settings = new ApplicationSettings();
+            settings.name = this.name;
+            settings.version = this.version;
+            return settings;
+        }
+    }
+}
diff --git a/alpha-core/src/main/java/com/techsenger/alpha/core/api/Framework.java b/alpha-core/src/main/java/com/techsenger/alpha/core/api/Framework.java
@@ -18,15 +18,21 @@
 
 import com.techsenger.alpha.core.api.registry.Registry;
 import com.techsenger.alpha.core.spi.repo.RepoService;
+import com.techsenger.toolkit.core.version.Version;
 
 /**
  *
  * @author Pavel Castornii
  */
-public interface Framework extends LayerOwner {
+public interface Framework {
 
     /**
-     * Returns framework settings.
+     * Returns the version of the framework.
+     */
+    Version getVersion();
+
+    /**
+     * Returns the framework settings.
      */
     FrameworkSettings getSettings();
 
diff --git a/alpha-core/src/main/java/com/techsenger/alpha/core/api/FrameworkSettings.java b/alpha-core/src/main/java/com/techsenger/alpha/core/api/FrameworkSettings.java
@@ -16,6 +16,8 @@
 
 package com.techsenger.alpha.core.api;
 
+import java.util.function.Consumer;
+
 /**
  *
  * @author Pavel Castornii
@@ -24,20 +26,26 @@ public final class FrameworkSettings {
 
     private boolean repoChecksumEnabled;
 
+    private ApplicationSettings application;
+
     private FrameworkSettings() {
     }
 
     public boolean isRepoChecksumEnabled() {
         return repoChecksumEnabled;
     }
 
+    public ApplicationSettings getApplication() {
+        return application;
+    }
+
     public static Builder builder() {
         return new Builder();
     }
 
     public static final class Builder {
-
         private boolean repoChecksumEnabled = true;
+        private final ApplicationSettings.Builder applicationBuilder = new ApplicationSettings.Builder();
 
         private Builder() {
         }
@@ -47,9 +55,15 @@ public Builder repoChecksumEnabled(boolean repoChecksumEnabled) {
             return this;
         }
 
+        public Builder application(Consumer<ApplicationSettings.Builder> consumer) {
+            consumer.accept(applicationBuilder);
+            return this;
+        }
+
         public FrameworkSettings build() {
             var settings = new FrameworkSettings();
             settings.repoChecksumEnabled = this.repoChecksumEnabled;
+            settings.application = applicationBuilder.build();
             return settings;
         }
     }
diff --git a/alpha-core/src/main/java/com/techsenger/alpha/core/impl/DefaultFramework.java b/alpha-core/src/main/java/com/techsenger/alpha/core/impl/DefaultFramework.java
@@ -118,16 +118,6 @@ public FrameworkSettings getSettings() {
         return settings;
     }
 
-    @Override
-    public String getName() {
-        return LAYER_NAME;
-    }
-
-    @Override
-    public String getFullName() {
-        return LAYER_NAME + Constants.NAME_VERSION_SEPARATOR + getVersion();
-    }
-
     @Override
     public Version getVersion() {
         return ProjectInfo.getVersion();
diff --git a/alpha-core/src/main/java/com/techsenger/alpha/core/impl/DefaultJvmInspector.java b/alpha-core/src/main/java/com/techsenger/alpha/core/impl/DefaultJvmInspector.java
@@ -95,7 +95,7 @@ public List<ThreadInfoModel> getThreadInfos() {
     @Override
     public ModulesInfo getModulesInfo() {
         Map<String, ModuleLayer> layersByName = new LinkedHashMap<>();
-        layersByName.put(ComponentLayerModel.resolveName(framework.getFullName(), 0),
+        layersByName.put(ComponentLayerModel.resolveName(framework.getSettings().getApplication().getFullName(), 0),
                 Framework.class.getModule().getLayer());
         var result = new DefaultModulesInfo();
         synchronized (framework.getComponentManager()) {
@@ -165,8 +165,8 @@ public LayersInfo getLayersInfo() {
         var map = new HashMap<Integer, ComponentLayerModel>();
         result.setLayersById(map);
         //boot layer or non boot
-        var bootLayer = createLayer(framework.getFullName(), 0, Framework.class.getModule().getLayer(),
-                idsByLayerConfig, null);
+        var bootLayer = createLayer(framework.getSettings().getApplication().getFullName(), 0,
+                Framework.class.getModule().getLayer(), idsByLayerConfig, null);
         map.put(bootLayer.getId(), bootLayer);
         components.forEach(c -> {
             var d = c.getDescriptor();
diff --git a/alpha-core/src/main/java/com/techsenger/alpha/core/impl/LayerBuilder.java b/alpha-core/src/main/java/com/techsenger/alpha/core/impl/LayerBuilder.java
@@ -324,7 +324,7 @@ private void applyModuleDirective(ModuleLayer.Controller controller, Module modu
      */
     private String resolveLayerName(ModuleLayer layer) {
         if (layer == Framework.class.getModule().getLayer()) {
-            return this.framework.getFullName();
+            return this.framework.getSettings().getApplication().getFullName();
         }
         var descriptor = framework.getComponentManager().findComponent(layer).getDescriptor();
         if (descriptor != null) {
@@ -349,8 +349,9 @@ private Map<String, ModuleLayer> findLayers(DefaultComponent component, String l
         } else {
             var nameAndVersion = Component.resolveNameAndVersion(layerName);
             if (nameAndVersion.getSecond() == null) { //find by name
-                if (nameAndVersion.getFirst().equals(framework.getName())) {
-                    layersByName.put(framework.getFullName(), Framework.class.getModule().getLayer());
+                if (nameAndVersion.getFirst().equals(framework.getSettings().getApplication().getName())) {
+                    layersByName.put(framework.getSettings().getApplication().getFullName(),
+                            Framework.class.getModule().getLayer());
                 } else {
                     Set<ComponentDescriptor> ancestors = component.getDescriptor().findAncestors();
                     for (var ancestor : ancestors) {
@@ -362,9 +363,10 @@ private Map<String, ModuleLayer> findLayers(DefaultComponent component, String l
                     }
                 }
             } else { //find by name and version
-                if (nameAndVersion.getFirst().equals(framework.getName())
+                if (nameAndVersion.getFirst().equals(framework.getSettings().getApplication().getName())
                         && nameAndVersion.getSecond().equals(framework.getVersion())) {
-                    layersByName.put(framework.getFullName(), Framework.class.getModule().getLayer());
+                    layersByName.put(framework.getSettings().getApplication().getFullName(),
+                            Framework.class.getModule().getLayer());
                 } else {
                     Set<ComponentDescriptor> ancestors = component.getDescriptor().findAncestors();
                     for (var ancestor : ancestors) {
diff --git a/alpha-demo/alpha-demo-cli/src/main/java/com/techsenger/alpha/demo/cli/CliDemo.java b/alpha-demo/alpha-demo-cli/src/main/java/com/techsenger/alpha/demo/cli/CliDemo.java
@@ -40,7 +40,12 @@ public static void main(String[] args) throws Exception {
 
         // Checksum is disabled because artifacts resolved from the local Maven repository
         // do not have checksum files when installed via "mvn install"
-        var settings = FrameworkSettings.builder().repoChecksumEnabled(false).build();
+        var settings = FrameworkSettings.builder()
+                .repoChecksumEnabled(false)
+                .application(app -> app
+                        .name("cli-demo")
+                        .version(Version.parse("1.0.0")))
+                .build();
 
         var framework = FrameworkFactory.create(settings, rootPath);
         resolveAndStartComponent(framework, "alpha-repo");
diff --git a/alpha-demo/alpha-demo-gui/src/main/java/com/techsenger/alpha/demo/gui/GuiDemo.java b/alpha-demo/alpha-demo-gui/src/main/java/com/techsenger/alpha/demo/gui/GuiDemo.java
@@ -39,7 +39,12 @@ public static void main(String[] args) throws Exception {
 
         // Checksum is disabled because artifacts resolved from the local Maven repository
         // do not have checksum files when installed via "mvn install"
-        var settings = FrameworkSettings.builder().repoChecksumEnabled(false).build();
+        var settings = FrameworkSettings.builder()
+                .repoChecksumEnabled(false)
+                .application(app -> app
+                        .name("gui-demo")
+                        .version(Version.parse("1.0.0")))
+                .build();
         var framework = FrameworkFactory.create(settings, rootPath);
         var componentManager = framework.getComponentManager();
 
diff --git a/alpha-demo/alpha-demo-starter/src/main/java/com/techsenger/alpha/demo/starter/StarterDemo.java b/alpha-demo/alpha-demo-starter/src/main/java/com/techsenger/alpha/demo/starter/StarterDemo.java
@@ -52,7 +52,12 @@ public final class StarterDemo {
 
     public static void main(String[] args) throws Exception {
         var frameworkPath = Paths.get(System.getProperty(SystemProperties.ROOT_PATH));
-        var settings = FrameworkSettings.builder().repoChecksumEnabled(false).build();
+        var settings = FrameworkSettings.builder()
+                .repoChecksumEnabled(false)
+                .application(app -> app
+                        .name("starter-demo")
+                        .version(Version.parse("1.0.0")))
+                .build();
         var framework = FrameworkFactory.create(settings, frameworkPath);
         var messagePrinter = new SystemMessagePrinter();
         var componentManager = framework.getComponentManager();
diff --git a/alpha-it/alpha-it-core/src/test/java/com/techsenger/alpha/it/core/ComponentManagerIT.java b/alpha-it/alpha-it-core/src/test/java/com/techsenger/alpha/it/core/ComponentManagerIT.java
@@ -23,6 +23,7 @@
 import com.techsenger.alpha.core.api.component.UnknownComponentException;
 import com.techsenger.alpha.core.api.message.LoggerMessagePrinter;
 import com.techsenger.alpha.it.shared.TestUtils;
+import com.techsenger.toolkit.core.version.Version;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -72,7 +73,13 @@ private static List<String> readFile(String fileName) throws IOException {
     public void startFramework() throws Exception {
         var frameworkPath = Paths.get(System.getProperty("basedir"), "target", "framework");
         TestUtils.copyDirectory(frameworkPath, tempFwPath);
-        framework = FrameworkFactory.create(FrameworkSettings.builder().repoChecksumEnabled(false).build(), tempFwPath);
+        var settings = FrameworkSettings.builder()
+                .repoChecksumEnabled(false)
+                .application(app -> app
+                        .name("core-test")
+                        .version(Version.parse("1.0.0")))
+                .build();
+        framework = FrameworkFactory.create(settings, tempFwPath);
         componentManager = framework.getComponentManager();
         componentManager.startComponent("alpha-repo", framework.getVersion());
     }
diff --git a/alpha-it/alpha-it-net/src/test/java/com/techsenger/alpha/it/net/ClientServiceIT.java b/alpha-it/alpha-it-net/src/test/java/com/techsenger/alpha/it/net/ClientServiceIT.java
@@ -77,7 +77,13 @@ public class ClientServiceIT {
     @BeforeAll
     public static void startFramework() throws Exception {
         var fwPath = Paths.get(System.getProperty("basedir"), "target", "framework");
-        framework = FrameworkFactory.create(FrameworkSettings.builder().repoChecksumEnabled(false).build(), fwPath);
+        var settings = FrameworkSettings.builder()
+                .repoChecksumEnabled(false)
+                .application(app -> app
+                        .name("client-test")
+                        .version(Version.parse("1.0.0")))
+                .build();
+        framework = FrameworkFactory.create(settings, fwPath);
         server = ServerServiceFactory.create(framework);
         server.start(HOST, PORT);
         client = ClientServiceFactory.create();
diff --git a/alpha-it/alpha-it-net/src/test/java/com/techsenger/alpha/it/net/DomainClientIT.java b/alpha-it/alpha-it-net/src/test/java/com/techsenger/alpha/it/net/DomainClientIT.java
@@ -80,7 +80,13 @@ public class DomainClientIT {
     public void startFramework() throws Exception {
         var frameworkPath = Paths.get(System.getProperty("basedir"), "target", "framework");
         TestUtils.copyDirectory(frameworkPath, tempFwPath);
-        framework = FrameworkFactory.create(FrameworkSettings.builder().repoChecksumEnabled(false).build(), tempFwPath);
+        var settings = FrameworkSettings.builder()
+                .repoChecksumEnabled(false)
+                .application(app -> app
+                        .name("client-test")
+                        .version(Version.parse("1.0.0")))
+                .build();
+        framework = FrameworkFactory.create(settings, tempFwPath);
         var componentManager = framework.getComponentManager();
         componentManager.startComponent("alpha-repo", framework.getVersion());
         componentManager.resolveComponent("alpha-server", framework.getVersion(), new LoggerMessagePrinter(logger));
@@ -531,7 +537,8 @@ public void getLayersInfo_twoComponentsStarted_correctLayersInfo() throws Except
         var layersInfo = client.getLayersInfo();
         layersInfo.resolveReferences();
         assertThat(layersInfo.getLayersById()).hasSize(3);
-        assertThat(layersInfo.getLayersById().get(0).getName()).isEqualTo(framework.getFullName());
+        assertThat(layersInfo.getLayersById().get(0).getName())
+                .isEqualTo(framework.getSettings().getApplication().getFullName());
     }
 
     // -------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`package com.techsenger.alpha.core.api;`
`18`	`18`
	`19`	`+import java.util.function.Consumer;`
	`20`	`+`
`19`	`21`	`/**`
`20`	`22`	`*`
`21`	`23`	`* @author Pavel Castornii`
`@@ -24,20 +26,26 @@ public final class FrameworkSettings {`
`24`	`26`
`25`	`27`	`private boolean repoChecksumEnabled;`
`26`	`28`
	`29`	`+ private ApplicationSettings application;`
	`30`	`+`
`27`	`31`	`private FrameworkSettings() {`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`public boolean isRepoChecksumEnabled() {`
`31`	`35`	`return repoChecksumEnabled;`
`32`	`36`	`}`
`33`	`37`
	`38`	`+ public ApplicationSettings getApplication() {`
	`39`	`+ return application;`
	`40`	`+ }`
	`41`	`+`
`34`	`42`	`public static Builder builder() {`
`35`	`43`	`return new Builder();`
`36`	`44`	`}`
`37`	`45`
`38`	`46`	`public static final class Builder {`
`39`		`-`
`40`	`47`	`private boolean repoChecksumEnabled = true;`
	`48`	`+ private final ApplicationSettings.Builder applicationBuilder = new ApplicationSettings.Builder();`
`41`	`49`
`42`	`50`	`private Builder() {`
`43`	`51`	`}`
`@@ -47,9 +55,15 @@ public Builder repoChecksumEnabled(boolean repoChecksumEnabled) {`
`47`	`55`	`return this;`
`48`	`56`	`}`
`49`	`57`
	`58`	`+ public Builder application(Consumer<ApplicationSettings.Builder> consumer) {`
	`59`	`+ consumer.accept(applicationBuilder);`
	`60`	`+ return this;`
	`61`	`+ }`
	`62`	`+`
`50`	`63`	`public FrameworkSettings build() {`
`51`	`64`	`var settings = new FrameworkSettings();`
`52`	`65`	`settings.repoChecksumEnabled = this.repoChecksumEnabled;`
	`66`	`+ settings.application = applicationBuilder.build();`
`53`	`67`	`return settings;`
`54`	`68`	`}`
`55`	`69`	`}`