From b57e8affb850142f8e480a4c78ae0e20bb4be1af Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 30 Jul 2018 22:17:02 -0700 Subject: [PATCH] A few fixes via checkstyle --- .../java/com/keildraco/config/Config.java | 10 +++--- .../com/keildraco/config/data/DataQuery.java | 6 ++-- .../keildraco/config/data/ItemMatcher.java | 24 ++++++------- .../keildraco/config/factory/TypeFactory.java | 11 +++--- .../keildraco/config/states/IStateParser.java | 9 ++++- .../config/states/KeyValueParser.java | 8 ++--- .../keildraco/config/states/ListParser.java | 16 ++++----- .../config/states/OperationParser.java | 12 +++---- .../config/states/SectionParser.java | 19 +++++----- .../keildraco/config/states/package-info.java | 5 +-- .../config/types/IdentifierType.java | 2 +- .../com/keildraco/config/types/ListType.java | 11 +++--- .../config/types/ParserInternalTypeBase.java | 13 ++++--- .../keildraco/config/types/SectionType.java | 8 ++--- .../keildraco/config/tests/ConfigAPITest.java | 7 ++-- .../config/tests/data/DataQueryTest.java | 2 +- .../config/tests/data/package-info.java | 5 +-- .../config/tests/factory/package-info.java | 5 +-- .../keildraco/config/tests/package-info.java | 5 +-- .../tests/states/KeyValueParserTest.java | 24 ++++++------- .../config/tests/states/ListParserTest.java | 15 ++++---- .../tests/states/OperationParserTest.java | 35 ++++++++++--------- .../tests/states/SectionParserTest.java | 32 ++++++++--------- .../config/tests/states/package-info.java | 5 +-- .../tests/types/IdentifierTypeTest.java | 5 ++- .../config/tests/types/ListTypeTest.java | 3 -- .../types/ParserInternalTypeBaseTest.java | 3 -- .../config/tests/types/SectionTypeTest.java | 3 -- .../config/tests/types/package-info.java | 5 +-- 29 files changed, 145 insertions(+), 163 deletions(-) diff --git a/src/main/java/com/keildraco/config/Config.java b/src/main/java/com/keildraco/config/Config.java index 4b95084..644393b 100644 --- a/src/main/java/com/keildraco/config/Config.java +++ b/src/main/java/com/keildraco/config/Config.java @@ -28,6 +28,7 @@ import com.keildraco.config.factory.TypeFactory; import com.keildraco.config.types.*; import com.keildraco.config.states.*; + import static com.keildraco.config.types.ParserInternalTypeBase.EmptyType; import static com.keildraco.config.types.ParserInternalTypeBase.ItemType; @@ -93,8 +94,8 @@ public static void registerParser(final String name, final Class registerType(type.getType(), type.getClass())); - internalParsers.entrySet().stream().forEach( ent -> registerParser(ent.getKey(), ent.getValue())); + internalTypes.stream().forEach(type -> registerType(type.getType(), type.getClass())); + internalParsers.entrySet().stream().forEach(ent -> registerParser(ent.getKey(), ent.getValue())); } public static void reset() { @@ -109,13 +110,14 @@ private static SectionType runParser(final Reader reader) { tok.slashSlashComments(true); tok.slashStarComments(true); final ParserInternalTypeBase root = coreTypeFactory.getType(null, "root", "", ItemType.SECTION); - return (SectionType)coreTypeFactory.getParser("SECTION", root).getState(tok); + return (SectionType) coreTypeFactory.getParser("SECTION", root).getState(tok); } private static FileSystem getFilesystemForURI(final URI uri) throws IOException { - if(uri.getScheme().equalsIgnoreCase("jar")) return FileSystems.newFileSystem(uri, Collections.emptyMap()); + if (uri.getScheme().equalsIgnoreCase("jar")) return FileSystems.newFileSystem(uri, Collections.emptyMap()); else return FileSystems.getDefault(); } + public static DataQuery LoadFile(final URI filePath) throws IOException { final FileSystem fs = getFilesystemForURI(filePath); final Path p = fs.getPath(filePath.getPath().substring(1)); diff --git a/src/main/java/com/keildraco/config/data/DataQuery.java b/src/main/java/com/keildraco/config/data/DataQuery.java index e342bb7..82ca3f3 100644 --- a/src/main/java/com/keildraco/config/data/DataQuery.java +++ b/src/main/java/com/keildraco/config/data/DataQuery.java @@ -17,11 +17,11 @@ public static DataQuery of(final SectionType section) { public boolean get(final String key) { // find item, or "all" - if(this.baseSection.has(key)) { + if (this.baseSection.has(key)) { return true; - } else if(key.indexOf('.') > 0) { + } else if (key.indexOf('.') > 0) { final String base = String.format("%s.all", key.substring(0, key.lastIndexOf('.'))); - if(this.baseSection.has(base)) { + if (this.baseSection.has(base)) { final String term = key.substring(key.lastIndexOf('.')+1); return new ItemMatcher(this.baseSection.get(base)).matches(term); } else { diff --git a/src/main/java/com/keildraco/config/data/ItemMatcher.java b/src/main/java/com/keildraco/config/data/ItemMatcher.java index 8a1c585..c5cde87 100644 --- a/src/main/java/com/keildraco/config/data/ItemMatcher.java +++ b/src/main/java/com/keildraco/config/data/ItemMatcher.java @@ -34,17 +34,17 @@ public boolean matches(final String name) { } private boolean doMatch(final ItemType type, final String bn, final String xn) { - switch(type) { + switch (type) { case IDENTIFIER: - if(xn.length() > 0) return this.identMatches((IdentifierType)this.thisItem,xn)&&this.thisItem.getName().equalsIgnoreCase(bn); - else return this.identMatches((IdentifierType)this.thisItem,bn); + if (xn.length() > 0) return this.identMatches((IdentifierType) this.thisItem,xn)&&this.thisItem.getName().equalsIgnoreCase(bn); + else return this.identMatches((IdentifierType) this.thisItem,bn); case LIST: - if(this.thisItem.has(bn) && xn.length() > 0) return (new ItemMatcher(this.thisItem.get(bn))).matches(xn); + if (this.thisItem.has(bn) && xn.length() > 0) return (new ItemMatcher(this.thisItem.get(bn))).matches(xn); else return this.listMatchesAny(bn); case OPERATION: return this.operatorMatches(xn.length()>0?String.format("%s.%s", bn, xn):bn); case SECTION: - if(xn.length() > 0) return (new ItemMatcher(this.thisItem.get(bn))).matches(xn); + if (xn.length() > 0) return (new ItemMatcher(this.thisItem.get(bn))).matches(xn); return this.sectionMatches(bn); default: return false; @@ -56,22 +56,22 @@ private boolean sectionMatches(final SectionType sec, final String name) { } private boolean sectionMatches(final String name) { - return this.sectionMatches((SectionType)this.thisItem, name); + return this.sectionMatches((SectionType) this.thisItem, name); } private boolean matchOperator(final OperationType op, final String itemName, final String valueName) { String matchName = itemName; - if(op.getName().equalsIgnoreCase(itemName) && valueName.length() > 0) { + if (op.getName().equalsIgnoreCase(itemName) && valueName.length() > 0) { matchName = valueName; } - if(op.getOperator() == '!') return !op.getValue().equalsIgnoreCase(matchName); - else if(op.getOperator() == '~') return op.getValue().equalsIgnoreCase(matchName); + if (op.getOperator() == '!') return !op.getValue().equalsIgnoreCase(matchName); + else if (op.getOperator() == '~') return op.getValue().equalsIgnoreCase(matchName); return true; } private boolean operatorMatches(final OperationType op, final String name) { - if(name.indexOf('.') > 0) { + if (name.indexOf('.') > 0) { final String in = name.substring(0, name.indexOf('.')); final String vn = name.substring(name.indexOf('.')+1); return this.matchOperator(op, in, vn); @@ -81,7 +81,7 @@ private boolean operatorMatches(final OperationType op, final String name) { } private boolean operatorMatches(final String name) { - return this.operatorMatches((OperationType)this.thisItem, name); + return this.operatorMatches((OperationType) this.thisItem, name); } private boolean identMatches(final IdentifierType ident, final String name) { @@ -93,6 +93,6 @@ private boolean listMatchesAny(final ListType theList, final String name) { } private boolean listMatchesAny(final String name) { - return this.listMatchesAny((ListType)this.thisItem,name); + return this.listMatchesAny((ListType) this.thisItem,name); } } diff --git a/src/main/java/com/keildraco/config/factory/TypeFactory.java b/src/main/java/com/keildraco/config/factory/TypeFactory.java index 9bea8ba..295284e 100644 --- a/src/main/java/com/keildraco/config/factory/TypeFactory.java +++ b/src/main/java/com/keildraco/config/factory/TypeFactory.java @@ -1,6 +1,3 @@ -/** - * - */ package com.keildraco.config.factory; import java.io.StreamTokenizer; @@ -22,7 +19,7 @@ public class TypeFactory { private final Map parserMap; /** - * Private default constructor + * Private default constructor. */ public TypeFactory() { this.typeMap = new ConcurrentHashMap<>(); @@ -44,14 +41,14 @@ public void registerParser(final IParserState parser, final String name) { @Nullable public IStateParser getParser(final String parserName, @Nullable final ParserInternalTypeBase parent) { final IParserState parser = this.parserMap.getOrDefault(parserName, null); - if(parser == null) return null; + if (parser == null) return null; return parser.get(); } - public ParserInternalTypeBase parseTokens(String parserName, @Nullable final ParserInternalTypeBase parent, final StreamTokenizer tok, final String itemName) { + public ParserInternalTypeBase parseTokens(final String parserName, @Nullable final ParserInternalTypeBase parent, final StreamTokenizer tok, final String itemName) { final IStateParser parser = this.getParser(parserName, parent); - if(parser==null) return ParserInternalTypeBase.EmptyType; + if (parser==null) return ParserInternalTypeBase.EmptyType; parser.clearErrors(); parser.setName(itemName); diff --git a/src/main/java/com/keildraco/config/states/IStateParser.java b/src/main/java/com/keildraco/config/states/IStateParser.java index 1425283..b7ddad0 100644 --- a/src/main/java/com/keildraco/config/states/IStateParser.java +++ b/src/main/java/com/keildraco/config/states/IStateParser.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.StreamTokenizer; + import static java.io.StreamTokenizer.*; import com.keildraco.config.Config; @@ -12,10 +13,11 @@ public interface IStateParser { public static final String IDENTIFIER_PATTERN = "^\\s*[a-zA-Z_]{1}[a-zA-Z0-9_]*\\s*$"; public void setFactory(TypeFactory factory); + public TypeFactory getFactory(); default public String ttypeToString(final int ttype) { - switch(ttype) { + switch (ttype) { case TT_WORD: return "TT_WORD"; case TT_NUMBER: @@ -30,6 +32,7 @@ default public String ttypeToString(final int ttype) { } public void setErrored(); + public boolean errored(); default public int peekToken(final StreamTokenizer tok) { @@ -57,9 +60,13 @@ default public int nextToken(final StreamTokenizer tok) { } public ParserInternalTypeBase getState(final StreamTokenizer tok); + public void setParent(final ParserInternalTypeBase parent); + public ParserInternalTypeBase getParent(); + default public void setName(final String name) { /* this space intentionally blank */ } public String getName(); + public void clearErrors(); } diff --git a/src/main/java/com/keildraco/config/states/KeyValueParser.java b/src/main/java/com/keildraco/config/states/KeyValueParser.java index 4ad621e..e785061 100644 --- a/src/main/java/com/keildraco/config/states/KeyValueParser.java +++ b/src/main/java/com/keildraco/config/states/KeyValueParser.java @@ -41,12 +41,12 @@ public boolean errored() { public ParserInternalTypeBase getState(final StreamTokenizer tok) { final int p = this.nextToken(tok); - if(!this.errored() && p == TT_WORD && tok.sval.matches(IDENTIFIER_PATTERN)) { + if (!this.errored() && p == TT_WORD && tok.sval.matches(IDENTIFIER_PATTERN)) { final String temp = tok.sval; - if(this.peekToken(tok) == '(') return this.factory.parseTokens("OPERATION", null, tok, temp); + if (this.peekToken(tok) == '(') return this.factory.parseTokens("OPERATION", null, tok, temp); else return this.factory.getType(this.getParent(), this.name, temp, ItemType.IDENTIFIER); - } else if(!errored() && p != TT_WORD) { - switch(p) { + } else if (!errored() && p != TT_WORD) { + switch (p) { case StreamTokenizer.TT_EOF: Config.LOGGER.error("Premature End of File while parsing a key-value pair, line %d", tok.lineno()); this.setErrored(); diff --git a/src/main/java/com/keildraco/config/states/ListParser.java b/src/main/java/com/keildraco/config/states/ListParser.java index 6f0e706..b042e6d 100644 --- a/src/main/java/com/keildraco/config/states/ListParser.java +++ b/src/main/java/com/keildraco/config/states/ListParser.java @@ -1,6 +1,3 @@ -/** - * - */ package com.keildraco.config.states; import java.io.StreamTokenizer; @@ -13,6 +10,7 @@ import com.keildraco.config.Config; import com.keildraco.config.factory.TypeFactory; import com.keildraco.config.types.*; + import static com.keildraco.config.types.ParserInternalTypeBase.ItemType; import static com.keildraco.config.types.ParserInternalTypeBase.EmptyType; @@ -61,14 +59,14 @@ public ParserInternalTypeBase getState(final StreamTokenizer tok) { int p; final Deque store = new LinkedList<>(); String ident; - while((p = this.nextToken(tok)) != StreamTokenizer.TT_EOF && p != ']') { - if(p=='[') continue; - if(!this.errored && p == StreamTokenizer.TT_WORD && tok.sval.matches(IDENTIFIER_PATTERN)) { + while ((p = this.nextToken(tok)) != StreamTokenizer.TT_EOF && p != ']') { + if (p=='[') continue; + if (!this.errored && p == StreamTokenizer.TT_WORD && tok.sval.matches(IDENTIFIER_PATTERN)) { ident = tok.sval; final ParserInternalTypeBase temp = this.getToken(tok, ident); temp.setName(ident); store.push(temp); - } else if(p == StreamTokenizer.TT_WORD) { + } else if (p == StreamTokenizer.TT_WORD) { Config.LOGGER.fatal("Error loading list, did not find TT_WORD matching %s where expected (%s found)", IDENTIFIER_PATTERN, tok.sval); return EmptyType; } @@ -81,9 +79,9 @@ public ParserInternalTypeBase getState(final StreamTokenizer tok) { private ParserInternalTypeBase getToken(final StreamTokenizer tok, final String ident) { final int n = this.peekToken(tok); - if(n != StreamTokenizer.TT_WORD && (n == ',' || n == ']')) { + if (n != StreamTokenizer.TT_WORD && (n == ',' || n == ']')) { return this.factory.getType(this.getParent(), this.getName(), ident, ItemType.IDENTIFIER); - } else if( n == '(') { + } else if (n == '(') { return this.factory.parseTokens("OPERATION", this.getParent(), tok, ident); } this.setErrored(); diff --git a/src/main/java/com/keildraco/config/states/OperationParser.java b/src/main/java/com/keildraco/config/states/OperationParser.java index e404652..aba6849 100644 --- a/src/main/java/com/keildraco/config/states/OperationParser.java +++ b/src/main/java/com/keildraco/config/states/OperationParser.java @@ -50,14 +50,14 @@ public boolean errored() { public ParserInternalTypeBase getState(final StreamTokenizer tok) { try { tok.nextToken(); - if(tok.ttype == '(') tok.nextToken(); + if (tok.ttype == '(') tok.nextToken(); - if(tok.ttype != StreamTokenizer.TT_EOF) { + if (tok.ttype != StreamTokenizer.TT_EOF) { final String operator = this.getOperator(tok); final String value = this.getIdentifier(tok); final int p = peekToken(tok); - if(p == ')') { - final OperationType rv = (OperationType)this.factory.getType(this.getParent(), this.name, value, ItemType.OPERATION); + if (p == ')') { + final OperationType rv = (OperationType) this.factory.getType(this.getParent(), this.name, value, ItemType.OPERATION); rv.setName(this.name); rv.setOperation(operator); return rv; @@ -77,12 +77,12 @@ public ParserInternalTypeBase getState(final StreamTokenizer tok) { private String getIdentifier(final StreamTokenizer tok) { this.nextToken(tok); - if(tok.ttype == StreamTokenizer.TT_WORD && tok.sval.matches(IDENTIFIER_PATTERN)) return tok.sval; + if (tok.ttype == StreamTokenizer.TT_WORD && tok.sval.matches(IDENTIFIER_PATTERN)) return tok.sval; throw new IllegalArgumentException("IDENTIFIER not available in token stream"); } private String getOperator(final StreamTokenizer tok) { - if(tok.ttype=='~'||tok.ttype=='!') return String.format("%c", tok.ttype); + if (tok.ttype=='~'||tok.ttype=='!') return String.format("%c", tok.ttype); throw new IllegalArgumentException("OPERATOR not available in token stream"); } diff --git a/src/main/java/com/keildraco/config/states/SectionParser.java b/src/main/java/com/keildraco/config/states/SectionParser.java index dc907f2..5946711 100644 --- a/src/main/java/com/keildraco/config/states/SectionParser.java +++ b/src/main/java/com/keildraco/config/states/SectionParser.java @@ -6,6 +6,7 @@ import com.keildraco.config.factory.TypeFactory; import com.keildraco.config.types.ParserInternalTypeBase; import com.keildraco.config.types.SectionType; + import static com.keildraco.config.types.ParserInternalTypeBase.EmptyType; import static java.io.StreamTokenizer.*; @@ -50,12 +51,12 @@ public boolean errored() { @Override public ParserInternalTypeBase getState(final StreamTokenizer tok) { String ident = ""; - while( this.nextToken(tok) != TT_EOF && !this.errored()) { + while (this.nextToken(tok) != TT_EOF && !this.errored()) { int tt = getTokenType(tok); - switch(tt) { + switch (tt) { case '=': - if(ident.equals("")) { + if (ident.equals("")) { this.setErrored(); Config.LOGGER.error("Found a store operation (=) where I was expecting an identifier"); return EmptyType; @@ -80,13 +81,13 @@ public ParserInternalTypeBase getState(final StreamTokenizer tok) { return EmptyType; } } - if(!this.errored()) return this.section; + if (!this.errored()) return this.section; return EmptyType; } private void getSection(final StreamTokenizer tok, final String ident) { final ParserInternalTypeBase sk = this.factory.parseTokens("SECTION", this.section, tok, ident); - if(EmptyType.equals(sk)) { + if (EmptyType.equals(sk)) { this.setErrored(); } else { this.section.addItem(sk); @@ -95,7 +96,7 @@ private void getSection(final StreamTokenizer tok, final String ident) { private void getKeyValue(final StreamTokenizer tok, final String ident) { final ParserInternalTypeBase kv = this.factory.parseTokens("KEYVALUE", this.section, tok, ident); - if(EmptyType.equals(kv)) { + if (EmptyType.equals(kv)) { this.setErrored(); } else { this.section.addItem(kv); @@ -103,13 +104,13 @@ private void getKeyValue(final StreamTokenizer tok, final String ident) { } private String itToString(final int tt) { - if(tt == -1) return "an Identifier"; + if (tt == -1) return "an Identifier"; return String.format("'%c'", tt); } private static int getTokenType(final StreamTokenizer tok) { - if(tok.ttype == TT_WORD) { - if(tok.sval.matches(IDENTIFIER_PATTERN)) return -1; + if (tok.ttype == TT_WORD) { + if (tok.sval.matches(IDENTIFIER_PATTERN)) return -1; return -4; } else { return tok.ttype; diff --git a/src/main/java/com/keildraco/config/states/package-info.java b/src/main/java/com/keildraco/config/states/package-info.java index f3503fa..cb188be 100644 --- a/src/main/java/com/keildraco/config/states/package-info.java +++ b/src/main/java/com/keildraco/config/states/package-info.java @@ -1,8 +1,5 @@ -/** - * - */ /** * @author Daniel Hazelton * */ -package com.keildraco.config.states; \ No newline at end of file +package com.keildraco.config.states; diff --git a/src/main/java/com/keildraco/config/types/IdentifierType.java b/src/main/java/com/keildraco/config/types/IdentifierType.java index dfee067..4c21966 100644 --- a/src/main/java/com/keildraco/config/types/IdentifierType.java +++ b/src/main/java/com/keildraco/config/types/IdentifierType.java @@ -36,7 +36,7 @@ public ParserInternalTypeBase get(final String s) { @Override public String asString() { - if(this.getName().equals("")) return this.ident; + if (this.getName().equals("")) return this.ident; return String.format("%s = %s", this.getName(), this.ident); } diff --git a/src/main/java/com/keildraco/config/types/ListType.java b/src/main/java/com/keildraco/config/types/ListType.java index ce29186..1bfbeed 100644 --- a/src/main/java/com/keildraco/config/types/ListType.java +++ b/src/main/java/com/keildraco/config/types/ListType.java @@ -40,19 +40,18 @@ public void addItem(final ParserInternalTypeBase item) { } @Override - public boolean has(String s) { + public boolean has(final String s) { return this.value.stream().anyMatch(pitb -> pitb.getName().equalsIgnoreCase(s)); } @Override public ParserInternalTypeBase get(final String s) { - if(!this.has(s)) return EmptyType; + if (!this.has(s)) return EmptyType; final Optional rv = this.value.stream().filter(pitb -> pitb.getName().equalsIgnoreCase(s)).findFirst(); - if(rv.isPresent()) { + if (rv.isPresent()) { return rv.get(); - } - else return EmptyType; + } else return EmptyType; } @Override @@ -67,7 +66,7 @@ public ItemType getType() { @Override public String asString() { - if(this.getName().equals("")) return String.format("[ %s ]", this.value.stream().map(v -> v.getType()==ItemType.OPERATION?v.asString():v.getValue()).collect(Collectors.joining(", "))); + if (this.getName().equals("")) return String.format("[ %s ]", this.value.stream().map(v -> v.getType()==ItemType.OPERATION?v.asString():v.getValue()).collect(Collectors.joining(", "))); return String.format("%s = [ %s ]", this.getName(), this.value.stream().map(v -> v.getType()==ItemType.OPERATION?v.asString():v.getValue()).collect(Collectors.joining(", "))); } diff --git a/src/main/java/com/keildraco/config/types/ParserInternalTypeBase.java b/src/main/java/com/keildraco/config/types/ParserInternalTypeBase.java index 236f662..178903a 100644 --- a/src/main/java/com/keildraco/config/types/ParserInternalTypeBase.java +++ b/src/main/java/com/keildraco/config/types/ParserInternalTypeBase.java @@ -14,10 +14,13 @@ public class ParserInternalTypeBase { public static final ParserInternalTypeBase EmptyType = new ParserInternalTypeBase("EMPTY") { @Override public boolean has(final String itemName) { return false; } + @Override public ParserInternalTypeBase get(final String itemName) { return null; } + @Override public void addItem(final ParserInternalTypeBase item) { /* the EmptyType does not store other items */ } + @Override public ItemType getType() { return ItemType.EMPTY; } }; @@ -37,20 +40,20 @@ public ParserInternalTypeBase(@Nullable final ParserInternalTypeBase parent, fin } public ParserInternalTypeBase get(final String itemName) { - if(itemName.indexOf('.') > 0) { + if (itemName.indexOf('.') > 0) { final String nameBits = itemName.substring(0,itemName.indexOf('.')); - if(this.has(nameBits)) { + if (this.has(nameBits)) { final String nameRest = itemName.substring(itemName.indexOf('.')+1); return this.get(nameBits)!=null?this.get(nameBits).get(nameRest):EmptyType; } - } else if(this.has(itemName)) { + } else if (this.has(itemName)) { return this.items.get(itemName); } return ParserInternalTypeBase.EmptyType; } public boolean has(final String itemName) { - if(itemName.contains(".")) { + if (itemName.contains(".")) { final String nn = itemName.substring(0, itemName.indexOf('.')); final String rest = itemName.substring(itemName.indexOf('.')+1); final boolean a = this.items.containsKey(nn); @@ -83,7 +86,7 @@ public List toList() { return Collections.emptyList(); } - public void setName(String name) { + public void setName(final String name) { this.name = name; } diff --git a/src/main/java/com/keildraco/config/types/SectionType.java b/src/main/java/com/keildraco/config/types/SectionType.java index cfc1aea..ba98e0a 100644 --- a/src/main/java/com/keildraco/config/types/SectionType.java +++ b/src/main/java/com/keildraco/config/types/SectionType.java @@ -9,7 +9,7 @@ public SectionType(final String name) { public SectionType(@Nullable final ParserInternalTypeBase parent, final String name) { super(parent,name); - if(this.getName().equals("")||parent==null) this.setName("ROOT"); + if (this.getName().equals("")||parent==null) this.setName("ROOT"); } public SectionType(@Nullable final ParserInternalTypeBase parent, final String name, final String value) { @@ -25,14 +25,14 @@ public ItemType getType() { public String asString() { final StringBuilder k = new StringBuilder(); - if(!this.getName().equals("ROOT")) { + if (!this.getName().equals("ROOT")) { k.append(String.format("%s {%n", this.getName())); } this.items.values().stream() - .forEach( v -> k.append(String.format(" %s%n", v.asString() ))); + .forEach(v -> k.append(String.format(" %s%n", v.asString()))); - if(!this.getName().equals("ROOT")) { + if (!this.getName().equals("ROOT")) { k.append(String.format("}%n")); } diff --git a/src/test/java/com/keildraco/config/tests/ConfigAPITest.java b/src/test/java/com/keildraco/config/tests/ConfigAPITest.java index 74a14af..d7d6c9b 100644 --- a/src/test/java/com/keildraco/config/tests/ConfigAPITest.java +++ b/src/test/java/com/keildraco/config/tests/ConfigAPITest.java @@ -9,6 +9,7 @@ import com.keildraco.config.Config; import com.keildraco.config.types.ParserInternalTypeBase.ItemType; + import static com.keildraco.config.types.ParserInternalTypeBase.EmptyType; import com.keildraco.config.data.DataQuery; @@ -60,7 +61,7 @@ public final void testLoadFileURI() { Config.registerKnownParts(); c = com.keildraco.config.Config.LoadFile(Paths.get("src", "main", "resources", "testassets", "base-config-test.cfg").toUri()); assertNotNull(c, "Load Worked? "); - } catch (final IOException | IllegalArgumentException e ) { + } catch (final IOException | IllegalArgumentException e) { fail(String.format("Caught exception running LoadFile([URI] %s)\n---> %s", Paths.get("src", "main", "resources", "testassets", "base-config-test.cfg").toUri(), e)); } } @@ -74,7 +75,7 @@ public final void testLoadFilePath() { Config.registerKnownParts(); c = com.keildraco.config.Config.LoadFile(p); assertNotNull(c, "Load Worked? "); - } catch (final IOException | IllegalArgumentException e ) { + } catch (final IOException | IllegalArgumentException e) { fail(String.format("Caught exception running LoadFile([PATH] %s)\n---> %s", Paths.get("src", "main", "resources", "testassets", "base-config-test.cfg").toString(), e)); } } @@ -88,7 +89,7 @@ public final void testLoadFileString() { Config.registerKnownParts(); c = com.keildraco.config.Config.LoadFile(Paths.get("src", "main", "resources", "testassets", "base-config-test.cfg").toString()); assertNotNull(c, "Load Worked? "); - } catch (final IOException | IllegalArgumentException e ) { + } catch (final IOException | IllegalArgumentException e) { fail(String.format("Caught exception running LoadFile([STRING] %s)\n---> %s", Paths.get("src", "main", "resources", "testassets", "base-config-test.cfg").toString(), e)); } diff --git a/src/test/java/com/keildraco/config/tests/data/DataQueryTest.java b/src/test/java/com/keildraco/config/tests/data/DataQueryTest.java index 648c4b0..83c74dd 100644 --- a/src/test/java/com/keildraco/config/tests/data/DataQueryTest.java +++ b/src/test/java/com/keildraco/config/tests/data/DataQueryTest.java @@ -23,7 +23,7 @@ public final void cleanup() { @Test public final void testOf() { try { - final DataQuery dq = DataQuery.of((SectionType)new SectionType("ROOT")); + final DataQuery dq = DataQuery.of((SectionType) new SectionType("ROOT")); assertNotNull(dq, "DataQuery.of() returned non-null"); } catch(final Exception e) { fail("Exception in call of DataQuery.of(): "+e); diff --git a/src/test/java/com/keildraco/config/tests/data/package-info.java b/src/test/java/com/keildraco/config/tests/data/package-info.java index 1390793..ea25083 100644 --- a/src/test/java/com/keildraco/config/tests/data/package-info.java +++ b/src/test/java/com/keildraco/config/tests/data/package-info.java @@ -1,8 +1,5 @@ -/** - * - */ /** * @author Daniel Hazelton * */ -package com.keildraco.config.tests.data; \ No newline at end of file +package com.keildraco.config.tests.data; diff --git a/src/test/java/com/keildraco/config/tests/factory/package-info.java b/src/test/java/com/keildraco/config/tests/factory/package-info.java index 3e579c7..fff048c 100644 --- a/src/test/java/com/keildraco/config/tests/factory/package-info.java +++ b/src/test/java/com/keildraco/config/tests/factory/package-info.java @@ -1,8 +1,5 @@ -/** - * - */ /** * @author Daniel Hazelton * */ -package com.keildraco.config.tests.factory; \ No newline at end of file +package com.keildraco.config.tests.factory; diff --git a/src/test/java/com/keildraco/config/tests/package-info.java b/src/test/java/com/keildraco/config/tests/package-info.java index 69a7ecf..36f1c58 100644 --- a/src/test/java/com/keildraco/config/tests/package-info.java +++ b/src/test/java/com/keildraco/config/tests/package-info.java @@ -1,8 +1,5 @@ -/** - * - */ /** * @author Daniel Hazelton * */ -package com.keildraco.config.tests; \ No newline at end of file +package com.keildraco.config.tests; diff --git a/src/test/java/com/keildraco/config/tests/states/KeyValueParserTest.java b/src/test/java/com/keildraco/config/tests/states/KeyValueParserTest.java index 0b9d8ff..9809ae1 100644 --- a/src/test/java/com/keildraco/config/tests/states/KeyValueParserTest.java +++ b/src/test/java/com/keildraco/config/tests/states/KeyValueParserTest.java @@ -37,10 +37,10 @@ public void setUp() throws Exception { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - while(((StreamTokenizer)invocation.getArgument(0)).nextToken() != StreamTokenizer.TT_EOF && - ((StreamTokenizer)invocation.getArgument(0)).ttype != ']') ; + while (((StreamTokenizer) invocation.getArgument(0)).nextToken() != StreamTokenizer.TT_EOF && + ((StreamTokenizer) invocation.getArgument(0)).ttype != ']') ; - if(((StreamTokenizer)invocation.getArgument(0)).ttype == ']') ((StreamTokenizer)invocation.getArgument(0)).nextToken(); + if (((StreamTokenizer) invocation.getArgument(0)).ttype == ']') ((StreamTokenizer) invocation.getArgument(0)).nextToken(); return new ListType(null, "", ""); } }); @@ -58,14 +58,14 @@ public String answer(final InvocationOnMock invocation) throws Throwable { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); - while(tok.nextToken() != StreamTokenizer.TT_EOF && - tok.ttype != ')') ; - + StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); + while (tok.nextToken() != StreamTokenizer.TT_EOF && + tok.ttype != ')'); + return factory.getType(null, "", "", ItemType.OPERATION); } }); - + when(p.getName()).thenAnswer(new Answer() { public String answer(final InvocationOnMock invocation) throws Throwable { @@ -87,7 +87,7 @@ public final void testKeyValueParser() { @SuppressWarnings("unused") final KeyValueParser p = new KeyValueParser(this.factory, "KEYVALUE"); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -98,7 +98,7 @@ public final void testSetErrored() { final KeyValueParser p = new KeyValueParser(this.factory, "KEYVALUE"); p.setErrored(); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling p.setErrored(): "+e.getMessage()); } } @@ -127,7 +127,7 @@ public final void testSetParent() { final KeyValueParser p = new KeyValueParser(this.factory, "KEYVALUE"); p.setParent(ParserInternalTypeBase.EmptyType); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling p.setParent(ParserInternalTypeBase.EmptyType): "+e.getMessage()); } } @@ -156,7 +156,7 @@ public final void testSetFactory() { final KeyValueParser p = new KeyValueParser(this.factory, "KEYVALUE"); p.setFactory(Config.getFactory()); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling p.setFactory(Config.getFactory()): "+e.getMessage()); } } diff --git a/src/test/java/com/keildraco/config/tests/states/ListParserTest.java b/src/test/java/com/keildraco/config/tests/states/ListParserTest.java index 6ac9eb3..7294f52 100644 --- a/src/test/java/com/keildraco/config/tests/states/ListParserTest.java +++ b/src/test/java/com/keildraco/config/tests/states/ListParserTest.java @@ -23,6 +23,7 @@ import com.keildraco.config.factory.TypeFactory; import com.keildraco.config.states.*; import com.keildraco.config.types.*; + import static com.keildraco.config.types.ParserInternalTypeBase.ItemType; @TestInstance(Lifecycle.PER_CLASS) @@ -37,8 +38,8 @@ public void setUp() throws Exception { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); - while(tok.nextToken() != StreamTokenizer.TT_EOF && + StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); + while (tok.nextToken() != StreamTokenizer.TT_EOF && tok.ttype != ')') ; return factory.getType(null, "", "", ItemType.OPERATION); @@ -66,7 +67,7 @@ public final void testListParser() { @SuppressWarnings("unused") final ListParser p = new ListParser(this.factory, "LIST"); assertTrue(true, "Expected to not get an exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -77,7 +78,7 @@ public final void testSetErrored() { final ListParser p = new ListParser(this.factory, "LIST"); p.setErrored(); assertTrue(true, "Expected to not get an exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -87,7 +88,7 @@ public final void testErrored() { try { final ListParser p = new ListParser(this.factory, "LIST"); assertFalse(p.errored(), "Expected new parser instance to return false from the errored() method"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -112,7 +113,7 @@ public final void testSetParent() { final ListParser p = new ListParser(this.factory, "LIST"); p.setParent(ParserInternalTypeBase.EmptyType); assertTrue(true, "Expected setParent() to not have an exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -159,7 +160,7 @@ public final void testSetFactory() { final ListParser p = new ListParser(this.factory, "LIST"); p.setFactory(Config.getFactory()); assertTrue(true, "Expected setFactory() to not have an exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } diff --git a/src/test/java/com/keildraco/config/tests/states/OperationParserTest.java b/src/test/java/com/keildraco/config/tests/states/OperationParserTest.java index ba728a4..7f17889 100644 --- a/src/test/java/com/keildraco/config/tests/states/OperationParserTest.java +++ b/src/test/java/com/keildraco/config/tests/states/OperationParserTest.java @@ -23,6 +23,7 @@ import com.keildraco.config.factory.TypeFactory; import com.keildraco.config.states.*; import com.keildraco.config.types.*; + import static com.keildraco.config.types.ParserInternalTypeBase.ItemType; @TestInstance(Lifecycle.PER_CLASS) @@ -37,8 +38,8 @@ public void setUp() throws Exception { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - final StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); - while(tok.nextToken() != StreamTokenizer.TT_EOF && + final StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); + while (tok.nextToken() != StreamTokenizer.TT_EOF && tok.ttype != ']') System.err.println(String.format("<<<%c :: %s", tok.ttype<127?(tok.ttype>0?tok.ttype:'-'):'?', tok.sval)); return factory.getType(null, "", "", ParserInternalTypeBase.ItemType.LIST); @@ -58,11 +59,11 @@ public String answer(final InvocationOnMock invocation) throws Throwable { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - final StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); + final StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); tok.nextToken(); - if(tok.ttype == StreamTokenizer.TT_WORD) return factory.getType(null, "", tok.sval, ParserInternalTypeBase.ItemType.IDENTIFIER); - else if(tok.ttype == '[') return factory.parseTokens("LIST", null, tok, ""); + if (tok.ttype == StreamTokenizer.TT_WORD) return factory.getType(null, "", tok.sval, ParserInternalTypeBase.ItemType.IDENTIFIER); + else if (tok.ttype == '[') return factory.parseTokens("LIST", null, tok, ""); else return ParserInternalTypeBase.EmptyType; } }); @@ -80,8 +81,8 @@ public String answer(final InvocationOnMock invocation) throws Throwable { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - final StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); - while(tok.nextToken() != StreamTokenizer.TT_EOF && + final StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); + while (tok.nextToken() != StreamTokenizer.TT_EOF && tok.ttype != '}') System.err.println(String.format("<<<%c :: %s", tok.ttype<127?(tok.ttype>0?tok.ttype:'-'):'?', tok.sval)); return factory.getType(null, "", "", ParserInternalTypeBase.ItemType.SECTION); @@ -109,7 +110,7 @@ public final void testOperationParserTypeFactory() { @SuppressWarnings("unused") final OperationParser p = new OperationParser(this.factory); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -120,7 +121,7 @@ public final void testOperationParserTypeFactoryParserInternalTypeBaseString() { @SuppressWarnings("unused") final OperationParser p = new OperationParser(this.factory, null, "BUGGER"); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -131,7 +132,7 @@ public final void testSetFactory() { final OperationParser p = new OperationParser(this.factory); p.setFactory(this.factory); assertTrue(true, "Expected no exception"); - } catch( Exception e ) { + } catch(final Exception e) { fail("Caught exception using a parsers setFactory(TypeFactory) method: "+e.getMessage()); } } @@ -142,7 +143,7 @@ public final void testGetFactory() { final OperationParser p = new OperationParser(this.factory); final TypeFactory f = p.getFactory(); assertEquals(this.factory, f); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception using a parsers getFactory() method: "+e.getMessage()); } } @@ -153,7 +154,7 @@ public final void testSetErrored() { final OperationParser p = new OperationParser(this.factory); p.setErrored(); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling a parsers setErrored() method: "+e.getMessage()); } } @@ -163,7 +164,7 @@ public final void testErrored() { try { final OperationParser p = new OperationParser(this.factory); assertEquals(Boolean.FALSE, p.errored()); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling a parsers errored() method: "+e.getMessage()); } } @@ -188,7 +189,7 @@ public final void testSetParent() { final OperationParser p = new OperationParser(this.factory); p.setParent(ParserInternalTypeBase.EmptyType); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling a parsers setParent() method: "+e.getMessage()); } } @@ -198,7 +199,7 @@ public final void testGetParent() { try { final OperationParser p = new OperationParser(this.factory); assertNull(p.getParent()); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling a parsers getParent() method: "+e.getMessage()); } } @@ -208,7 +209,7 @@ public final void testGetName() { try { final OperationParser p = new OperationParser(this.factory, null, "BUGGERED"); assertEquals("BUGGERED", p.getName()); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception trying to get a parsers name: "+e.getMessage()); } } @@ -219,7 +220,7 @@ public final void testClearErrors() { final OperationParser p = new OperationParser(this.factory); p.clearErrors(); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception telling a parser to clear its errors: "+e.getMessage()); } } diff --git a/src/test/java/com/keildraco/config/tests/states/SectionParserTest.java b/src/test/java/com/keildraco/config/tests/states/SectionParserTest.java index 9f430ac..d7bf5de 100644 --- a/src/test/java/com/keildraco/config/tests/states/SectionParserTest.java +++ b/src/test/java/com/keildraco/config/tests/states/SectionParserTest.java @@ -39,8 +39,8 @@ public void setUp() throws Exception { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - final StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); - while(tok.nextToken() != StreamTokenizer.TT_EOF && + final StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); + while (tok.nextToken() != StreamTokenizer.TT_EOF && tok.ttype != ']') System.err.println(String.format("<<<%c :: %s", tok.ttype<127?(tok.ttype>0?tok.ttype:'-'):'?', tok.sval)); return factory.getType(null, "", "", ParserInternalTypeBase.ItemType.LIST); @@ -60,11 +60,11 @@ public String answer(final InvocationOnMock invocation) throws Throwable { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - final StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); + final StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); tok.nextToken(); - if(tok.ttype == StreamTokenizer.TT_WORD) return factory.getType(null, "", tok.sval, ParserInternalTypeBase.ItemType.IDENTIFIER); - else if(tok.ttype == '[') return factory.parseTokens("LIST", null, tok, ""); + if (tok.ttype == StreamTokenizer.TT_WORD) return factory.getType(null, "", tok.sval, ParserInternalTypeBase.ItemType.IDENTIFIER); + else if (tok.ttype == '[') return factory.parseTokens("LIST", null, tok, ""); else return ParserInternalTypeBase.EmptyType; } }); @@ -82,8 +82,8 @@ public String answer(final InvocationOnMock invocation) throws Throwable { when(p.getState(isA(StreamTokenizer.class))).thenAnswer(new Answer() { public ParserInternalTypeBase answer(final InvocationOnMock invocation) throws Throwable { - StreamTokenizer tok = (StreamTokenizer)invocation.getArgument(0); - while(tok.nextToken() != StreamTokenizer.TT_EOF && + StreamTokenizer tok = (StreamTokenizer) invocation.getArgument(0); + while (tok.nextToken() != StreamTokenizer.TT_EOF && tok.ttype != ')') ; return factory.getType(null, "", "", ItemType.OPERATION); @@ -111,7 +111,7 @@ public final void testSectionParser() { @SuppressWarnings("unused") final SectionParser p = new SectionParser(this.factory); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -122,7 +122,7 @@ public final void testSectionParserTypeFactorySectionTypeString() { @SuppressWarnings("unused") final SectionParser p = new SectionParser(this.factory, null, "ROOT"); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -133,7 +133,7 @@ public final void testSectionParserTypeFactoryString() { @SuppressWarnings("unused") final SectionParser p = new SectionParser(this.factory, "ROOT"); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -144,7 +144,7 @@ public final void testSetErrored() { final SectionParser p = new SectionParser(this.factory, null, "ROOT"); p.setErrored(); assertTrue(true, "Expected no exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -154,7 +154,7 @@ public final void testErrored() { try { final SectionParser p = new SectionParser(this.factory, null, "ROOT"); assertFalse(p.errored(), "Expected fresh parser \"erorred()\" method to return false"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception instanting a new KeyValueParser: "+e.getMessage()); } } @@ -216,7 +216,7 @@ public final void testSetParent() { final SectionParser p = new SectionParser(this.factory); p.setParent(ParserInternalTypeBase.EmptyType); assertTrue(true, "Expected setParent() to not have an exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception in test: "+e.getMessage()); } } @@ -233,7 +233,7 @@ public final void testSetFactory() { final SectionParser p = new SectionParser(this.factory); p.setFactory(Config.getFactory()); assertTrue(true, "Expected setFactory() to not have an exception"); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling setFactory(): "+e.getMessage()); } } @@ -243,7 +243,7 @@ public final void testGetFactory() { try { final SectionParser p = new SectionParser(this.factory); assertEquals(this.factory, p.getFactory()); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling getFactory(): "+e.getMessage()); } } @@ -253,7 +253,7 @@ public final void testGetName() { try { final SectionParser p = new SectionParser(this.factory); assertEquals("ROOT", p.getName()); - } catch(final Exception e ) { + } catch(final Exception e) { fail("Caught exception calling getName(): "+e.getMessage()); } } diff --git a/src/test/java/com/keildraco/config/tests/states/package-info.java b/src/test/java/com/keildraco/config/tests/states/package-info.java index a0349c6..7dc48b6 100644 --- a/src/test/java/com/keildraco/config/tests/states/package-info.java +++ b/src/test/java/com/keildraco/config/tests/states/package-info.java @@ -1,8 +1,5 @@ -/** - * - */ /** * @author Daniel Hazelton * */ -package com.keildraco.config.tests.states; \ No newline at end of file +package com.keildraco.config.tests.states; diff --git a/src/test/java/com/keildraco/config/tests/types/IdentifierTypeTest.java b/src/test/java/com/keildraco/config/tests/types/IdentifierTypeTest.java index f796516..809b628 100644 --- a/src/test/java/com/keildraco/config/tests/types/IdentifierTypeTest.java +++ b/src/test/java/com/keildraco/config/tests/types/IdentifierTypeTest.java @@ -1,6 +1,3 @@ -/** - * - */ package com.keildraco.config.tests.types; import static org.junit.jupiter.api.Assertions.*; @@ -18,7 +15,9 @@ */ @TestInstance(Lifecycle.PER_CLASS) public class IdentifierTypeTest { + private IdentifierType testItem; + /** * @throws java.lang.Exception */ diff --git a/src/test/java/com/keildraco/config/tests/types/ListTypeTest.java b/src/test/java/com/keildraco/config/tests/types/ListTypeTest.java index eb3e978..49f211d 100644 --- a/src/test/java/com/keildraco/config/tests/types/ListTypeTest.java +++ b/src/test/java/com/keildraco/config/tests/types/ListTypeTest.java @@ -1,6 +1,3 @@ -/** - * - */ package com.keildraco.config.tests.types; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/keildraco/config/tests/types/ParserInternalTypeBaseTest.java b/src/test/java/com/keildraco/config/tests/types/ParserInternalTypeBaseTest.java index 9ddd6cc..ec63f60 100644 --- a/src/test/java/com/keildraco/config/tests/types/ParserInternalTypeBaseTest.java +++ b/src/test/java/com/keildraco/config/tests/types/ParserInternalTypeBaseTest.java @@ -1,6 +1,3 @@ -/** - * - */ package com.keildraco.config.tests.types; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/keildraco/config/tests/types/SectionTypeTest.java b/src/test/java/com/keildraco/config/tests/types/SectionTypeTest.java index 349973b..abbfb48 100644 --- a/src/test/java/com/keildraco/config/tests/types/SectionTypeTest.java +++ b/src/test/java/com/keildraco/config/tests/types/SectionTypeTest.java @@ -1,6 +1,3 @@ -/** - * - */ package com.keildraco.config.tests.types; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/com/keildraco/config/tests/types/package-info.java b/src/test/java/com/keildraco/config/tests/types/package-info.java index 9fabc7e..ecca193 100644 --- a/src/test/java/com/keildraco/config/tests/types/package-info.java +++ b/src/test/java/com/keildraco/config/tests/types/package-info.java @@ -1,8 +1,5 @@ -/** - * - */ /** * @author Daniel Hazelton * */ -package com.keildraco.config.tests.types; \ No newline at end of file +package com.keildraco.config.tests.types;