Skip to content

Commit 1bcbbc2

Browse files
committed
WIP
1 parent b02edda commit 1bcbbc2

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/MasterDispatcher.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ public Collection<Field> fields() {
6666
return List.of(
6767
Field.builder(MASTER_SOURCE)
6868
.optional(false)
69-
.description("The source of master password")
69+
.description("Source of the master password")
7070
.options(masterSources.entrySet().stream()
7171
.map(e -> {
72-
if (e instanceof MasterSourceMeta m) {
72+
MasterSource ms = e.getValue();
73+
if (ms instanceof MasterSourceMeta m) {
7374
Field.Builder b =
7475
Field.builder(e.getKey()).description(m.description());
7576
if (m.configTemplate().isPresent()) {
@@ -79,15 +80,16 @@ public Collection<Field> fields() {
7980
return b.build();
8081
} else {
8182
return Field.builder(e.getKey())
82-
.description("Field not described (needs manual configuration)")
83+
.description(e.getKey()
84+
+ "(Field not described, needs manual configuration)")
8385
.build();
8486
}
8587
})
8688
.toList())
8789
.build(),
8890
Field.builder(MASTER_CIPHER)
8991
.optional(false)
90-
.description("The cipher to use with master password")
92+
.description("Cipher to use with master password")
9193
.options(cipher.availableCiphers().stream()
9294
.map(c -> Field.builder(c).description(c).build())
9395
.toList())

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/sources/EnvMasterSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public EnvMasterSource() {
4242

4343
@Override
4444
public String description() {
45-
return "Extracts the master password out of environment variables with configured name";
45+
return "Environment variable";
4646
}
4747

4848
@Override

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/sources/GpgAgentMasterSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public GpgAgentMasterSource() {
5353

5454
@Override
5555
public String description() {
56-
return "Interacts with GPG Agent via domain socket to get the master password";
56+
return "GPG Agent";
5757
}
5858

5959
@Override

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/sources/SystemPropertyMasterSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public SystemPropertyMasterSource() {
4242

4343
@Override
4444
public String description() {
45-
return "Extracts the master password out of Java System properties with configured key";
45+
return "Java System properties";
4646
}
4747

4848
@Override

0 commit comments

Comments
 (0)