Skip to content

Commit b4c95a8

Browse files
ivanmooreivanmoore
committed
use default intellij formatting just to make it easier when doing diff later on
1 parent 2234468 commit b4c95a8

11 files changed

Lines changed: 537 additions & 527 deletions

‎src/main/java/com/cleancoder/args/Args.java‎

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -5,110 +5,110 @@
55
import static com.cleancoder.args.ArgsException.ErrorCode.*;
66

77
public class Args {
8-
private Map<Character, ArgumentMarshaler> marshalers;
9-
private Set<Character> argsFound;
10-
private ListIterator<String> currentArgument;
11-
12-
public Args(String schema, String[] args) throws ArgsException {
13-
marshalers = new HashMap<Character, ArgumentMarshaler>();
14-
argsFound = new HashSet<Character>();
15-
16-
parseSchema(schema);
17-
parseArgumentStrings(Arrays.asList(args));
18-
}
19-
20-
private void parseSchema(String schema) throws ArgsException {
21-
for (String element : schema.split(","))
22-
if (element.length() > 0)
23-
parseSchemaElement(element.trim());
24-
}
25-
26-
private void parseSchemaElement(String element) throws ArgsException {
27-
char elementId = element.charAt(0);
28-
String elementTail = element.substring(1);
29-
validateSchemaElementId(elementId);
30-
if (elementTail.length() == 0)
31-
marshalers.put(elementId, new BooleanArgumentMarshaler());
32-
else if (elementTail.equals("*"))
33-
marshalers.put(elementId, new StringArgumentMarshaler());
34-
else if (elementTail.equals("#"))
35-
marshalers.put(elementId, new IntegerArgumentMarshaler());
36-
else if (elementTail.equals("##"))
37-
marshalers.put(elementId, new DoubleArgumentMarshaler());
38-
else if (elementTail.equals("[*]"))
39-
marshalers.put(elementId, new StringArrayArgumentMarshaler());
40-
else if (elementTail.equals("&"))
41-
marshalers.put(elementId, new MapArgumentMarshaler());
42-
else
43-
throw new ArgsException(INVALID_ARGUMENT_FORMAT, elementId, elementTail);
44-
}
45-
46-
private void validateSchemaElementId(char elementId) throws ArgsException {
47-
if (!Character.isLetter(elementId))
48-
throw new ArgsException(INVALID_ARGUMENT_NAME, elementId, null);
49-
}
50-
51-
private void parseArgumentStrings(List<String> argsList) throws ArgsException {
52-
for (currentArgument = argsList.listIterator(); currentArgument.hasNext();) {
53-
String argString = currentArgument.next();
54-
if (argString.startsWith("-")) {
55-
parseArgumentCharacters(argString.substring(1));
56-
} else {
57-
currentArgument.previous();
58-
break;
59-
}
8+
private Map<Character, ArgumentMarshaler> marshalers;
9+
private Set<Character> argsFound;
10+
private ListIterator<String> currentArgument;
11+
12+
public Args(String schema, String[] args) throws ArgsException {
13+
marshalers = new HashMap<Character, ArgumentMarshaler>();
14+
argsFound = new HashSet<Character>();
15+
16+
parseSchema(schema);
17+
parseArgumentStrings(Arrays.asList(args));
6018
}
61-
}
62-
63-
private void parseArgumentCharacters(String argChars) throws ArgsException {
64-
for (int i = 0; i < argChars.length(); i++)
65-
parseArgumentCharacter(argChars.charAt(i));
66-
}
67-
68-
private void parseArgumentCharacter(char argChar) throws ArgsException {
69-
ArgumentMarshaler m = marshalers.get(argChar);
70-
if (m == null) {
71-
throw new ArgsException(UNEXPECTED_ARGUMENT, argChar, null);
72-
} else {
73-
argsFound.add(argChar);
74-
try {
75-
m.set(currentArgument);
76-
} catch (ArgsException e) {
77-
e.setErrorArgumentId(argChar);
78-
throw e;
79-
}
19+
20+
private void parseSchema(String schema) throws ArgsException {
21+
for (String element : schema.split(","))
22+
if (element.length() > 0)
23+
parseSchemaElement(element.trim());
8024
}
81-
}
8225

83-
public boolean has(char arg) {
84-
return argsFound.contains(arg);
85-
}
26+
private void parseSchemaElement(String element) throws ArgsException {
27+
char elementId = element.charAt(0);
28+
String elementTail = element.substring(1);
29+
validateSchemaElementId(elementId);
30+
if (elementTail.length() == 0)
31+
marshalers.put(elementId, new BooleanArgumentMarshaler());
32+
else if (elementTail.equals("*"))
33+
marshalers.put(elementId, new StringArgumentMarshaler());
34+
else if (elementTail.equals("#"))
35+
marshalers.put(elementId, new IntegerArgumentMarshaler());
36+
else if (elementTail.equals("##"))
37+
marshalers.put(elementId, new DoubleArgumentMarshaler());
38+
else if (elementTail.equals("[*]"))
39+
marshalers.put(elementId, new StringArrayArgumentMarshaler());
40+
else if (elementTail.equals("&"))
41+
marshalers.put(elementId, new MapArgumentMarshaler());
42+
else
43+
throw new ArgsException(INVALID_ARGUMENT_FORMAT, elementId, elementTail);
44+
}
8645

87-
public int nextArgument() {
88-
return currentArgument.nextIndex();
89-
}
46+
private void validateSchemaElementId(char elementId) throws ArgsException {
47+
if (!Character.isLetter(elementId))
48+
throw new ArgsException(INVALID_ARGUMENT_NAME, elementId, null);
49+
}
9050

91-
public boolean getBoolean(char arg) {
92-
return BooleanArgumentMarshaler.getValue(marshalers.get(arg));
93-
}
51+
private void parseArgumentStrings(List<String> argsList) throws ArgsException {
52+
for (currentArgument = argsList.listIterator(); currentArgument.hasNext(); ) {
53+
String argString = currentArgument.next();
54+
if (argString.startsWith("-")) {
55+
parseArgumentCharacters(argString.substring(1));
56+
} else {
57+
currentArgument.previous();
58+
break;
59+
}
60+
}
61+
}
9462

95-
public String getString(char arg) {
96-
return StringArgumentMarshaler.getValue(marshalers.get(arg));
97-
}
63+
private void parseArgumentCharacters(String argChars) throws ArgsException {
64+
for (int i = 0; i < argChars.length(); i++)
65+
parseArgumentCharacter(argChars.charAt(i));
66+
}
9867

99-
public int getInt(char arg) {
100-
return IntegerArgumentMarshaler.getValue(marshalers.get(arg));
101-
}
68+
private void parseArgumentCharacter(char argChar) throws ArgsException {
69+
ArgumentMarshaler m = marshalers.get(argChar);
70+
if (m == null) {
71+
throw new ArgsException(UNEXPECTED_ARGUMENT, argChar, null);
72+
} else {
73+
argsFound.add(argChar);
74+
try {
75+
m.set(currentArgument);
76+
} catch (ArgsException e) {
77+
e.setErrorArgumentId(argChar);
78+
throw e;
79+
}
80+
}
81+
}
10282

103-
public double getDouble(char arg) {
104-
return DoubleArgumentMarshaler.getValue(marshalers.get(arg));
105-
}
83+
public boolean has(char arg) {
84+
return argsFound.contains(arg);
85+
}
10686

107-
public String[] getStringArray(char arg) {
108-
return StringArrayArgumentMarshaler.getValue(marshalers.get(arg));
109-
}
87+
public int nextArgument() {
88+
return currentArgument.nextIndex();
89+
}
11090

111-
public Map<String, String> getMap(char arg) {
112-
return MapArgumentMarshaler.getValue(marshalers.get(arg));
113-
}
91+
public boolean getBoolean(char arg) {
92+
return BooleanArgumentMarshaler.getValue(marshalers.get(arg));
93+
}
94+
95+
public String getString(char arg) {
96+
return StringArgumentMarshaler.getValue(marshalers.get(arg));
97+
}
98+
99+
public int getInt(char arg) {
100+
return IntegerArgumentMarshaler.getValue(marshalers.get(arg));
101+
}
102+
103+
public double getDouble(char arg) {
104+
return DoubleArgumentMarshaler.getValue(marshalers.get(arg));
105+
}
106+
107+
public String[] getStringArray(char arg) {
108+
return StringArrayArgumentMarshaler.getValue(marshalers.get(arg));
109+
}
110+
111+
public Map<String, String> getMap(char arg) {
112+
return MapArgumentMarshaler.getValue(marshalers.get(arg));
113+
}
114114
}

‎src/main/java/com/cleancoder/args/ArgsException.java‎

Lines changed: 71 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,90 @@
11
package com.cleancoder.args;
22

3-
import static com.cleancoder.args.ArgsException.ErrorCode.*;
3+
import static com.cleancoder.args.ArgsException.ErrorCode.OK;
44

55
public class ArgsException extends Exception {
6-
private char errorArgumentId = '\0';
7-
private String errorParameter = null;
8-
private ErrorCode errorCode = OK;
6+
private char errorArgumentId = '\0';
7+
private String errorParameter = null;
8+
private ErrorCode errorCode = OK;
99

10-
public ArgsException() {}
10+
public ArgsException() {
11+
}
1112

12-
public ArgsException(String message) {super(message);}
13+
public ArgsException(String message) {
14+
super(message);
15+
}
1316

14-
public ArgsException(ErrorCode errorCode) {
15-
this.errorCode = errorCode;
16-
}
17+
public ArgsException(ErrorCode errorCode) {
18+
this.errorCode = errorCode;
19+
}
1720

18-
public ArgsException(ErrorCode errorCode, String errorParameter) {
19-
this.errorCode = errorCode;
20-
this.errorParameter = errorParameter;
21-
}
21+
public ArgsException(ErrorCode errorCode, String errorParameter) {
22+
this.errorCode = errorCode;
23+
this.errorParameter = errorParameter;
24+
}
2225

23-
public ArgsException(ErrorCode errorCode, char errorArgumentId, String errorParameter) {
24-
this.errorCode = errorCode;
25-
this.errorParameter = errorParameter;
26-
this.errorArgumentId = errorArgumentId;
27-
}
26+
public ArgsException(ErrorCode errorCode, char errorArgumentId, String errorParameter) {
27+
this.errorCode = errorCode;
28+
this.errorParameter = errorParameter;
29+
this.errorArgumentId = errorArgumentId;
30+
}
2831

29-
public char getErrorArgumentId() {
30-
return errorArgumentId;
31-
}
32+
public char getErrorArgumentId() {
33+
return errorArgumentId;
34+
}
3235

33-
public void setErrorArgumentId(char errorArgumentId) {
34-
this.errorArgumentId = errorArgumentId;
35-
}
36+
public void setErrorArgumentId(char errorArgumentId) {
37+
this.errorArgumentId = errorArgumentId;
38+
}
3639

37-
public String getErrorParameter() {
38-
return errorParameter;
39-
}
40+
public String getErrorParameter() {
41+
return errorParameter;
42+
}
4043

41-
public void setErrorParameter(String errorParameter) {
42-
this.errorParameter = errorParameter;
43-
}
44+
public void setErrorParameter(String errorParameter) {
45+
this.errorParameter = errorParameter;
46+
}
4447

45-
public ErrorCode getErrorCode() {
46-
return errorCode;
47-
}
48+
public ErrorCode getErrorCode() {
49+
return errorCode;
50+
}
4851

49-
public void setErrorCode(ErrorCode errorCode) {
50-
this.errorCode = errorCode;
51-
}
52+
public void setErrorCode(ErrorCode errorCode) {
53+
this.errorCode = errorCode;
54+
}
5255

53-
public String errorMessage() {
54-
switch (errorCode) {
55-
case OK:
56-
return "TILT: Should not get here.";
57-
case UNEXPECTED_ARGUMENT:
58-
return String.format("Argument -%c unexpected.", errorArgumentId);
59-
case MISSING_STRING:
60-
return String.format("Could not find string parameter for -%c.", errorArgumentId);
61-
case INVALID_INTEGER:
62-
return String.format("Argument -%c expects an integer but was '%s'.", errorArgumentId, errorParameter);
63-
case MISSING_INTEGER:
64-
return String.format("Could not find integer parameter for -%c.", errorArgumentId);
65-
case INVALID_DOUBLE:
66-
return String.format("Argument -%c expects a double but was '%s'.", errorArgumentId, errorParameter);
67-
case MISSING_DOUBLE:
68-
return String.format("Could not find double parameter for -%c.", errorArgumentId);
69-
case INVALID_ARGUMENT_NAME:
70-
return String.format("'%c' is not a valid argument name.", errorArgumentId);
71-
case INVALID_ARGUMENT_FORMAT:
72-
return String.format("'%s' is not a valid argument format.", errorParameter);
73-
case MISSING_MAP:
74-
return String.format("Could not find map string for -%c.", errorArgumentId);
75-
case MALFORMED_MAP:
76-
return String.format("Map string for -%c is not of form k1:v1,k2:v2...", errorArgumentId);
56+
public String errorMessage() {
57+
switch (errorCode) {
58+
case OK:
59+
return "TILT: Should not get here.";
60+
case UNEXPECTED_ARGUMENT:
61+
return String.format("Argument -%c unexpected.", errorArgumentId);
62+
case MISSING_STRING:
63+
return String.format("Could not find string parameter for -%c.", errorArgumentId);
64+
case INVALID_INTEGER:
65+
return String.format("Argument -%c expects an integer but was '%s'.", errorArgumentId, errorParameter);
66+
case MISSING_INTEGER:
67+
return String.format("Could not find integer parameter for -%c.", errorArgumentId);
68+
case INVALID_DOUBLE:
69+
return String.format("Argument -%c expects a double but was '%s'.", errorArgumentId, errorParameter);
70+
case MISSING_DOUBLE:
71+
return String.format("Could not find double parameter for -%c.", errorArgumentId);
72+
case INVALID_ARGUMENT_NAME:
73+
return String.format("'%c' is not a valid argument name.", errorArgumentId);
74+
case INVALID_ARGUMENT_FORMAT:
75+
return String.format("'%s' is not a valid argument format.", errorParameter);
76+
case MISSING_MAP:
77+
return String.format("Could not find map string for -%c.", errorArgumentId);
78+
case MALFORMED_MAP:
79+
return String.format("Map string for -%c is not of form k1:v1,k2:v2...", errorArgumentId);
80+
}
81+
return "";
7782
}
78-
return "";
79-
}
8083

81-
public enum ErrorCode {
82-
OK, INVALID_ARGUMENT_FORMAT, UNEXPECTED_ARGUMENT, INVALID_ARGUMENT_NAME,
83-
MISSING_STRING,
84-
MISSING_INTEGER, INVALID_INTEGER,
85-
MISSING_DOUBLE, MALFORMED_MAP, MISSING_MAP, INVALID_DOUBLE}
84+
public enum ErrorCode {
85+
OK, INVALID_ARGUMENT_FORMAT, UNEXPECTED_ARGUMENT, INVALID_ARGUMENT_NAME,
86+
MISSING_STRING,
87+
MISSING_INTEGER, INVALID_INTEGER,
88+
MISSING_DOUBLE, MALFORMED_MAP, MISSING_MAP, INVALID_DOUBLE
89+
}
8690
}

‎src/main/java/com/cleancoder/args/ArgumentMarshaler.java‎

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

55
public interface ArgumentMarshaler {
6-
void set(Iterator<String> currentArgument) throws ArgsException;
6+
void set(Iterator<String> currentArgument) throws ArgsException;
77
}

‎src/main/java/com/cleancoder/args/BooleanArgumentMarshaler.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
import java.util.Iterator;
44

55
public class BooleanArgumentMarshaler implements ArgumentMarshaler {
6-
private boolean booleanValue = false;
6+
private boolean booleanValue = false;
77

8-
public void set(Iterator<String> currentArgument) throws ArgsException {
9-
booleanValue = true;
10-
}
8+
public static boolean getValue(ArgumentMarshaler am) {
9+
if (am != null && am instanceof BooleanArgumentMarshaler)
10+
return ((BooleanArgumentMarshaler) am).booleanValue;
11+
else
12+
return false;
13+
}
1114

12-
public static boolean getValue(ArgumentMarshaler am) {
13-
if (am != null && am instanceof BooleanArgumentMarshaler)
14-
return ((BooleanArgumentMarshaler) am).booleanValue;
15-
else
16-
return false;
17-
}
15+
public void set(Iterator<String> currentArgument) throws ArgsException {
16+
booleanValue = true;
17+
}
1818
}

0 commit comments

Comments
 (0)