Skip to content
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

Jump to bottom

feat(output): pass RTI to output generators for additional interaction #395

Merged
merged 1 commit into from
Jul 29, 2024
Merged

feat(output): pass RTI to output generators for additional interaction #395

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
2 changes: 1 addition & 1 deletion ...osaic-output/src/main/java/org/eclipse/mosaic/fed/output/ambassador/OutputAmbassador.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private Collection<OutputGeneratorLoader> loadConfiguration() {
// create a new instance of the generator loader
loader = loaderClass.getDeclaredConstructor().newInstance();

loader.initialize(generatorXmlConfiguration, ambassadorParameter.configuration.getParentFile());
loader.initialize(rti, generatorXmlConfiguration, ambassadorParameter.configuration.getParentFile());
} catch (InternalFederateException e) {
throw e;
} catch (Exception e) {
Expand Down
16 changes: 15 additions & 1 deletion ...-output/src/main/java/org/eclipse/mosaic/fed/output/ambassador/OutputGeneratorLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

package org.eclipse.mosaic.fed.output.ambassador;

import org.eclipse.mosaic.rti.api.RtiAmbassador;

import ch.qos.logback.classic.LoggerContext;
import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.tree.ImmutableNode;
Expand All @@ -30,6 +32,7 @@
public abstract class OutputGeneratorLoader {

private String id;
private RtiAmbassador rti;
private int updateInterval;
private long handleStartTime;
private long handleEndTime;
Expand All @@ -40,10 +43,12 @@ public abstract class OutputGeneratorLoader {
* this method is called just after a new instance of a derived output generator config was created.
* subclasses should call this method at first, and then proceed with reading custom parameters from the configuration
*
* @param rti the {@link RtiAmbassador} of the federation
* @param config output generator configuration
* @param configurationDirectory output generator configuration directory path
*/
public void initialize(HierarchicalConfiguration<ImmutableNode> config, File configurationDirectory) throws Exception {
public void initialize(RtiAmbassador rti, HierarchicalConfiguration<ImmutableNode> config, File configurationDirectory) throws Exception {
this.rti = rti;
this.id = ConfigHelper.getId(config);
this.updateInterval = ConfigHelper.getUpdateInterval(config);
this.handleStartTime = ConfigHelper.getHandleStartTime(config);
Expand All @@ -62,6 +67,15 @@ public String getId() {
return id;
}

/**
* Returns the {@link RtiAmbassador} of the federation for additional interaction with RTI.
*
* @return the {@link RtiAmbassador} of the federation.
*/
protected RtiAmbassador getRti() {
return rti;
}

/**
* Returns the update interval.
*
Expand Down
5 changes: 3 additions & 2 deletions ...c-output/src/main/java/org/eclipse/mosaic/fed/output/generator/file/FileOutputLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.eclipse.mosaic.fed.output.generator.file.write.WriteByFile;
import org.eclipse.mosaic.fed.output.generator.file.write.WriteByFileCompress;
import org.eclipse.mosaic.fed.output.generator.file.write.WriteByLog;
import org.eclipse.mosaic.rti.api.RtiAmbassador;

import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.tree.ImmutableNode;
Expand Down Expand Up @@ -146,8 +147,8 @@ private Write getWrite(HierarchicalConfiguration<ImmutableNode> sub) throws IOEx
}

@Override
public void initialize(HierarchicalConfiguration<ImmutableNode> config, File configurationDirectory) throws Exception {
super.initialize(config, configurationDirectory);
public void initialize(RtiAmbassador rti, HierarchicalConfiguration<ImmutableNode> config, File configurationDirectory) throws Exception {
super.initialize(rti, config, configurationDirectory);
try {
this.writer = this.getWrite(config);
this.interactionFormatter = this.createInteractionFormatter(config);
Expand Down
5 changes: 3 additions & 2 deletions ...ain/java/org/eclipse/mosaic/fed/output/generator/websocket/WebsocketVisualizerLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.eclipse.mosaic.fed.output.ambassador.AbstractOutputGenerator;
import org.eclipse.mosaic.fed.output.ambassador.OutputGeneratorLoader;
import org.eclipse.mosaic.rti.api.RtiAmbassador;

import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.tree.ImmutableNode;
Expand All @@ -28,8 +29,8 @@ public class WebsocketVisualizerLoader extends OutputGeneratorLoader {
private int port;

@Override
public void initialize(HierarchicalConfiguration<ImmutableNode> config, File configurationDirectory) throws Exception {
super.initialize(config, configurationDirectory);
public void initialize(RtiAmbassador rti, HierarchicalConfiguration<ImmutableNode> config, File configurationDirectory) throws Exception {
super.initialize(rti, config, configurationDirectory);
port = config.getInt("port");
}

Expand Down
Loading