Skip to content

Commit 4a7fef8

Browse files
committed
IAction getInstallerClass:Class<?> => getInstallerClassName:String
1 parent b88456d commit 4a7fef8

File tree

9 files changed

+16
-25
lines changed

9 files changed

+16
-25
lines changed

src/main/java/org/scm4j/deployer/api/Action.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
public class Action implements IAction {
99

10-
@Getter final private Class installerClass;
10+
@Getter final private String installerClassName;
1111
@Getter private Map<String, Object> params;
1212
private final Component comp;
1313

14-
public Action(Class installerClass, Component comp) {
15-
this.installerClass = installerClass;
14+
public Action(String installerClassName, Component comp) {
15+
this.installerClassName = installerClassName;
1616
this.comp = comp;
1717
}
1818

@@ -33,7 +33,7 @@ public Component parent() {
3333
@Override
3434
public String toString() {
3535
return "Action{" +
36-
"installerClass=" + installerClass +
36+
"installerClass=" + installerClassName +
3737
'}';
3838
}
3939
}

src/main/java/org/scm4j/deployer/api/Component.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public Component(String coords, ProductStructure productStructure) {
1717
this.ps = productStructure;
1818
}
1919

20-
public Action addAction(Class clazz) {
20+
public Action addAction(String clazz) {
2121
Action action = new Action(clazz, this);
2222
if (this.installationProcedure == null) {
2323
this.installationProcedure = new InstallationProcedure(new ArrayList<>());

src/main/java/org/scm4j/deployer/api/DeploymentContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class DeploymentContext implements IDeploymentContext {
1212
private String mainArtifact;
1313
private Map<String, File> artifacts;
1414
private URL deploymentURL;
15-
private Map<Class, Map<String,Object>> params;
15+
private Map<String, Map<String,Object>> params;
1616

1717
public DeploymentContext(String mainArtifact) {
1818
this.mainArtifact = mainArtifact;

src/main/java/org/scm4j/deployer/api/IAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
import java.util.Map;
44

55
public interface IAction {
6-
Class getInstallerClass();
6+
String getInstallerClassName();
77
Map<String, Object> getParams();
88
}

src/main/java/org/scm4j/deployer/api/IDeploymentContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ public interface IDeploymentContext {
99
String getMainArtifact();
1010
Map<String, File> getArtifacts();
1111
URL getDeploymentURL();
12-
Map<Class, Map<String, Object>> getParams();
12+
Map<String, Map<String, Object>> getParams();
1313

1414
}

src/main/java/org/scm4j/deployer/api/IInstallationProcedure.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
public interface IInstallationProcedure {
88
List<IAction> getActions();
9-
default Map<Class, Map<String, Object>> getActionsParams() {
10-
return getActions().stream().collect(Collectors.toMap(IAction::getInstallerClass, IAction::getParams));
9+
default Map<String, Map<String, Object>> getActionsParams() {
10+
return getActions().stream().collect(Collectors.toMap(IAction::getInstallerClassName, IAction::getParams));
1111
}
1212
}

src/main/java/org/scm4j/deployer/api/ISwitcher.java

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

src/test/java/org/scm4j/deployer/api/ApiTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ public class ApiTest {
1212
public void testProductStructure() {
1313
ProductStructure ps = ProductStructure.create()
1414
.addComponent("123:123:123")
15-
.addAction(Executor.class)
15+
.addAction("Executor")
1616
.addParam("1", "2")
1717
.addParam("3", "4")
1818
.parent()
19-
.addAction(IComponentDeployer.class)
19+
.addAction("IComponentDeployer")
2020
.parent()
2121
.parent()
2222
.addComponent("345:345:345")
23-
.addAction(IComponentDeployer.class)
23+
.addAction("IComponentDeployer")
2424
.addParam("8", "9")
2525
.parent()
2626
.parent();
2727
assertEquals(ps.getComponents().get(0).getArtifactCoords().toString(), "123:123:jar:123");
28-
assertEquals(ps.getComponents().get(1).getInstallationProcedure().getActions().get(0).getInstallerClass(), IComponentDeployer.class);
28+
assertEquals(ps.getComponents().get(1).getInstallationProcedure().getActions().get(0).getInstallerClassName(), "IComponentDeployer");
2929
assertEquals(ps.getComponents().get(1).getInstallationProcedure().getActions().get(0).getParams().get("8"), "9");
3030
assertEquals(ps.getComponents().get(1).getArtifactCoords().toString(), "345:345:jar:345");
3131
assertEquals(ps.getComponents().get(0).getInstallationProcedure().getActions().get(0).getParams().get("3"), "4");
32-
assertEquals(ps.getComponents().get(0).getInstallationProcedure().getActions().get(1).getInstallerClass(), IComponentDeployer.class);
32+
assertEquals(ps.getComponents().get(0).getInstallationProcedure().getActions().get(1).getInstallerClassName(), "IComponentDeployer");
3333
}
3434
}

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.0-SNAPSHOT
1+
0.1.0-SNAPSHOT

0 commit comments

Comments
 (0)