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

PAYARA-1904 Add jndi to get set ordinal commands #1833

Merged
merged 11 commits into from
Sep 4, 2017
Merged

PAYARA-1904 Add jndi to get set ordinal commands #1833

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b09a056
add-jndi-to-get-set-ordinal-commands
mikecroft Aug 3, 2017
3ece79e
add cases to switches
mikecroft Aug 3, 2017
1fc2199
source should be optional
mikecroft Aug 3, 2017
707ff7b
source should be optional
mikecroft Aug 3, 2017
1198f69
Source should be optional
mikecroft Aug 3, 2017
82ddce9
Source should be optional
mikecroft Aug 3, 2017
45f2a61
Clarify error text for ambiguous sourceName property
mikecroft Aug 3, 2017
407d974
Clarify error text for ambiguous sourceName property
mikecroft Aug 3, 2017
7d1f067
jndi source for set-config-property
mikecroft Aug 10, 2017
1a6a09b
slightly modify JNDI setter and add getter
mikecroft Aug 11, 2017
28b3190
removed prefix and added support for targets to getter
mikecroft Aug 14, 2017
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
5 changes: 4 additions & 1 deletion ...service/src/main/java/fish/payara/nucleus/microprofile/config/admin/GetConfigOrdinal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
})
public class GetConfigOrdinal implements AdminCommand {

@Param(acceptableValues = "domain,config,server,application,module,cluster", defaultValue = "domain")
@Param(optional = true, acceptableValues = "domain,config,server,application,module,cluster,jndi", defaultValue = "domain")
String source;

@Param(optional = true, defaultValue = "server") // if no target is specified it will be the DAS
Expand Down Expand Up @@ -116,6 +116,9 @@ public void execute(AdminCommandContext context) {
case "cluster": {
result = serviceConfig.getClusterOrdinality();
break;
}case "jndi": {
result = serviceConfig.getJNDIOrdinality();
break;
}
}
context.getActionReport().setMessage(result.toString());
Expand Down
4 changes: 2 additions & 2 deletions ...ervice/src/main/java/fish/payara/nucleus/microprofile/config/admin/GetConfigProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
})
public class GetConfigProperty implements AdminCommand {

@Param(acceptableValues = "domain,config,server,application,module,cluster", defaultValue = "domain")
@Param(optional = true, acceptableValues = "domain,config,server,application,module,cluster", defaultValue = "domain")
String source;

@Param(optional = true, defaultValue = "server") // if no target is specified it will be the DAS
Expand Down Expand Up @@ -125,7 +125,7 @@ public void execute(AdminCommandContext context) {
}
case "module": {
if (sourceName == null || moduleName == null) {
context.getActionReport().failure(Logger.getLogger(SetConfigProperty.class.getName()), "sourceName and moduleName are required parameters module is the source");
context.getActionReport().failure(Logger.getLogger(SetConfigProperty.class.getName()), "sourceName and moduleName are required parameters if module is the source. The sourceName should be the name of the application where the module is deployed.");
} else {
result = service.getModuleProperty(sourceName, moduleName, propertyName);
}
Expand Down
7 changes: 5 additions & 2 deletions ...service/src/main/java/fish/payara/nucleus/microprofile/config/admin/SetConfigOrdinal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class SetConfigOrdinal implements AdminCommand {
@Param()
int ordinal;

@Param(acceptableValues = "domain,config,server,application,module,cluster", defaultValue = "domain")
@Param(optional = true, acceptableValues = "domain,config,server,application,module,cluster,jndi", defaultValue = "domain")
String source;

@Param (optional = true, defaultValue = "server") // if no target is specified it will be the DAS
Expand Down Expand Up @@ -128,7 +128,10 @@ public Object run(MicroprofileConfigConfiguration config) {
config.setClusterOrdinality(ordinal);
break;
}

case "jndi": {
config.setJNDIOrdinality(ordinal);
break;
}
}
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions ...ervice/src/main/java/fish/payara/nucleus/microprofile/config/admin/SetConfigProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
})
public class SetConfigProperty implements AdminCommand {

@Param(acceptableValues = "domain,config,server,application,module,cluster", defaultValue = "domain")
@Param(optional = true, acceptableValues = "domain,config,server,application,module,cluster", defaultValue = "domain")
String source;

@Param(optional = true, defaultValue = "server") // if no target is specified it will be the DAS
Expand Down Expand Up @@ -127,7 +127,7 @@ public void execute(AdminCommandContext context) {
}
case "module": {
if (sourceName == null || moduleName == null) {
context.getActionReport().failure(Logger.getLogger(SetConfigProperty.class.getName()), "sourceName and moduleName are required parameters module is the source");
context.getActionReport().failure(Logger.getLogger(SetConfigProperty.class.getName()), "sourceName and moduleName are required parameters if module is the source. The sourceName should be the name of the application where the module is deployed.");
} else {
service.setModuleProperty(sourceName, moduleName, propertyName, propertyValue);
}
Expand Down