Skip to content

Commit c334edc

Browse files
frankgiordanofrankgiordano
committed
Refactor controller creation into domain factories with lazy cached controller helpers
1 parent 17b3c32 commit c334edc

75 files changed

Lines changed: 702 additions & 361 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/zos/shell/ZosShell.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import zos.shell.singleton.HistorySingleton;
1010
import zos.shell.singleton.TerminalSingleton;
1111
import zos.shell.singleton.configuration.ConfigSingleton;
12-
import zos.shell.singleton.configuration.model.Window;
1312
import zos.shell.state.ShellStateMachine;
1413

1514
import java.io.IOException;
@@ -98,7 +97,7 @@ private static void applyConfiguredFontSize(final TerminalSingleton terminalSing
9897
return;
9998
}
10099

101-
Window window = configSettings.getWindow();
100+
var window = configSettings.getWindow();
102101
if (window != null && window.getFontsize() != null) {
103102
int fontSize = Integer.parseInt(window.getFontsize());
104103
terminalSingleton.setFontSize(fontSize);

‎src/main/java/zos/shell/command/impl/BrowseJobCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.slf4j.LoggerFactory;
88
import zos.shell.command.AbstractCommand;
99
import zos.shell.command.CommandContext;
10-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
10+
import zos.shell.controller.container.ControllerFactories;
1111
import zos.shell.service.search.SearchCache;
1212

1313
public class BrowseJobCommand extends AbstractCommand {
@@ -54,7 +54,7 @@ protected void run(CommandContext ctx, CommandLine cmd) {
5454
}
5555

5656
boolean all = cmd.hasOption("a");
57-
var controller = ControllerFactoryContainerHolder.container()
57+
var controller = ControllerFactories.container()
5858
.getBrowseJobController(ctx.zosConnection, all, ctx.timeout);
5959

6060
String result = controller.browseJob(args.get(0));

‎src/main/java/zos/shell/command/impl/CancelCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.LoggerFactory;
66
import zos.shell.command.CommandContext;
77
import zos.shell.command.NoOptionCommand;
8-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
8+
import zos.shell.controller.container.ControllerFactories;
99

1010
public class CancelCommand extends NoOptionCommand {
1111

@@ -30,7 +30,7 @@ protected void run(CommandContext ctx, CommandLine cmd) {
3030
return;
3131
}
3232

33-
var ctrl = ControllerFactoryContainerHolder.container()
33+
var ctrl = ControllerFactories.container()
3434
.getCancelController(ctx.zosConnection, ctx.timeout);
3535

3636
ctx.out(ctrl.cancel(args.get(0)));

‎src/main/java/zos/shell/command/impl/CatCommand.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.LoggerFactory;
66
import zos.shell.command.CommandContext;
77
import zos.shell.command.NoOptionCommand;
8-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
8+
import zos.shell.controller.container.ControllerFactories;
99
import zos.shell.service.search.SearchCache;
1010

1111
public class CatCommand extends NoOptionCommand {
@@ -31,7 +31,8 @@ protected void run(CommandContext ctx, CommandLine cmd) {
3131
return;
3232
}
3333

34-
var ctrl = ControllerFactoryContainerHolder.container()
34+
var ctrl = ControllerFactories
35+
.datasetFactory()
3536
.getConcatController(ctx.zosConnection, ctx.timeout);
3637

3738
String result = ctrl.cat(ctx.currDataset, args.get(0));

‎src/main/java/zos/shell/command/impl/ChangeConnectionCommand.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import zos.shell.command.CommandContext;
77
import zos.shell.command.NoOptionCommand;
88
import zos.shell.constants.Constants;
9-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
9+
import zos.shell.controller.container.ControllerFactories;
1010
import zos.shell.singleton.ConnSingleton;
1111
import zos.shell.singleton.TerminalSingleton;
1212
import zos.shell.singleton.configuration.ConfigSingleton;
@@ -54,8 +54,9 @@ protected void run(CommandContext ctx, CommandLine cmd) {
5454
return;
5555
}
5656

57-
var changeConnController = ControllerFactoryContainerHolder.container()
58-
.getChangeConnController(ctx.terminal);
57+
var changeConnController = ControllerFactories
58+
.changeFactory()
59+
.getChangeConnectionController(ctx.terminal);
5960
ctx.zosConnection = changeConnController.changeZosConnection(ctx.zosConnection, changeIndex);
6061
ConnSingleton.getInstance().setCurrZosConnection(ctx.zosConnection, changeIndex);
6162
ctx.sshConnection = changeConnController.changeSshConnection(ctx.sshConnection, changeIndex);

‎src/main/java/zos/shell/command/impl/ChangeDirectoryCommand.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.LoggerFactory;
66
import zos.shell.command.CommandContext;
77
import zos.shell.command.NoOptionCommand;
8-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
8+
import zos.shell.controller.container.ControllerFactories;
99
import zos.shell.response.ResponseStatus;
1010

1111
public class ChangeDirectoryCommand extends NoOptionCommand {
@@ -31,7 +31,9 @@ protected void run(CommandContext ctx, CommandLine cmd) {
3131
return;
3232
}
3333

34-
var ctrl = ControllerFactoryContainerHolder.container().getChangeDirController();
34+
var ctrl = ControllerFactories
35+
.changeFactory()
36+
.getChangeDirectoryController();
3537
ResponseStatus rs = ctrl.cd(ctx.currDataset, args.get(0).toUpperCase());
3638

3739
if (!rs.isStatus()) {

‎src/main/java/zos/shell/command/impl/ColorCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.LoggerFactory;
66
import zos.shell.command.CommandContext;
77
import zos.shell.command.NoOptionCommand;
8-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
8+
import zos.shell.controller.container.ControllerFactories;
99
import zos.shell.utility.ColorUtil;
1010

1111
public class ColorCommand extends NoOptionCommand {
@@ -49,9 +49,9 @@ protected void run(CommandContext ctx, CommandLine cmd) {
4949
}
5050
}
5151

52-
var controller = ControllerFactoryContainerHolder
53-
.container()
54-
.getChangeWinController(ctx.terminal);
52+
var controller = ControllerFactories
53+
.changeFactory()
54+
.getChangeWindowController(ctx.terminal);
5555
String result = controller.changeColorSettings(args.get(0), args.size() == 2 ? args.get(1) : null);
5656
ctx.out(result);
5757
}

‎src/main/java/zos/shell/command/impl/ConnectionsCommand.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.LoggerFactory;
66
import zos.shell.command.CommandContext;
77
import zos.shell.command.NoOptionCommand;
8-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
8+
import zos.shell.controller.container.ControllerFactories;
99

1010
public class ConnectionsCommand extends NoOptionCommand {
1111

@@ -29,8 +29,9 @@ protected void run(CommandContext ctx, CommandLine cmd) {
2929
return;
3030
}
3131

32-
ControllerFactoryContainerHolder.container()
33-
.getChangeConnController(ctx.terminal)
32+
ControllerFactories
33+
.changeFactory()
34+
.getChangeConnectionController(ctx.terminal)
3435
.displayConnections();
3536
}
3637

‎src/main/java/zos/shell/command/impl/CopyCommand.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.LoggerFactory;
66
import zos.shell.command.CommandContext;
77
import zos.shell.command.NoOptionCommand;
8-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
8+
import zos.shell.controller.container.ControllerFactories;
99

1010
import java.util.List;
1111

@@ -32,7 +32,8 @@ protected void run(CommandContext ctx, CommandLine cmd) {
3232
return;
3333
}
3434

35-
var copyController = ControllerFactoryContainerHolder.container()
35+
var copyController = ControllerFactories
36+
.datasetFactory()
3637
.getCopyController(ctx.zosConnection, ctx.timeout);
3738

3839
String result = copyController.copy(ctx.currDataset, args.toArray(String[]::new));

‎src/main/java/zos/shell/command/impl/CountCommand.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.slf4j.LoggerFactory;
77
import zos.shell.command.AbstractCommand;
88
import zos.shell.command.CommandContext;
9-
import zos.shell.controller.container.ControllerFactoryContainerHolder;
9+
import zos.shell.controller.container.ControllerFactories;
1010

1111
public class CountCommand extends AbstractCommand {
1212

@@ -50,7 +50,8 @@ protected void run(CommandContext ctx, CommandLine cmd) {
5050
return;
5151
}
5252

53-
var controller = ControllerFactoryContainerHolder.container()
53+
var controller = ControllerFactories
54+
.datasetFactory()
5455
.getCountController(ctx.zosConnection, ctx.timeout);
5556

5657
if (memberOpt) {

0 commit comments

Comments
 (0)