Skip to content

Commit 2f9b3df

Browse files
committed
refactor: override name, use defult "supports" for instruction parsers
1 parent 8c8da2b commit 2f9b3df

21 files changed

+54
-40
lines changed

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/AddInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
public class AddInstructionParser extends AddLikeInstructionParser {
2424
@Override
25-
public boolean supports(String keyword) {
26-
return keyword.equalsIgnoreCase("ADD");
25+
public String instructionName() {
26+
return "ADD";
2727
}
2828

2929
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/ArgInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
public class ArgInstructionParser implements InstructionParser {
2828
@Override
29-
public boolean supports(String keyword) {
30-
return keyword.equalsIgnoreCase("ARG");
29+
public String instructionName() {
30+
return "ARG";
3131
}
3232

3333
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/CmdInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
public class CmdInstructionParser extends CommandLikeInstructionParser {
2929
@Override
30-
public boolean supports(String keyword) {
31-
return keyword.equalsIgnoreCase("CMD");
30+
public String instructionName() {
31+
return "CMD";
3232
}
3333

3434
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/CommentParser.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828

2929
public class CommentParser implements InstructionParser {
3030
@Override
31-
public boolean supports(String keyword) {
32-
return keyword.equalsIgnoreCase("#");
31+
public String instructionName() {
32+
// a special case where we treat a comment as an instruction
33+
return "#";
3334
}
3435

3536
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/CopyInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
public class CopyInstructionParser extends AddLikeInstructionParser {
2424
@Override
25-
public boolean supports(String keyword) {
26-
return keyword.equalsIgnoreCase("COPY");
25+
public String instructionName() {
26+
return "COPY";
2727
}
2828

2929
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/EntrypointInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
public class EntrypointInstructionParser extends CommandLikeInstructionParser {
2929
@Override
30-
public boolean supports(String keyword) {
31-
return keyword.equalsIgnoreCase("ENTRYPOINT");
30+
public String instructionName() {
31+
return "ENTRYPOINT";
3232
}
3333

3434
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/EnvInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
public class EnvInstructionParser implements InstructionParser {
2828
@Override
29-
public boolean supports(String keyword) {
30-
return keyword.equalsIgnoreCase("ENV");
29+
public String instructionName() {
30+
return "ENV";
3131
}
3232

3333
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/ExposeInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
public class ExposeInstructionParser implements InstructionParser {
2828
@Override
29-
public boolean supports(String keyword) {
30-
return keyword.equalsIgnoreCase("EXPOSE");
29+
public String instructionName() {
30+
return "EXPOSE";
3131
}
3232

3333
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/FromInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
public class FromInstructionParser implements InstructionParser {
2929
@Override
30-
public boolean supports(String keyword) {
31-
return keyword.equalsIgnoreCase("FROM");
30+
public String instructionName() {
31+
return "FROM";
3232
}
3333

3434
@Override

src/main/java/com/github/jimschubert/rewrite/docker/internal/parsers/HealthcheckInstructionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
public class HealthcheckInstructionParser implements InstructionParser {
2929
@Override
30-
public boolean supports(String keyword) {
31-
return keyword.equalsIgnoreCase("HEALTHCHECK");
30+
public String instructionName() {
31+
return "HEALTHCHECK";
3232
}
3333

3434
@Override

0 commit comments

Comments
 (0)