arch-jedi/tpquery
3
0
Fork 0
Code Issues 2 Pull requests Activity

shorted the validator check classes to normal length.

Browse source
This commit is contained in:
Willem 2015-12-27 16:44:23 +01:00
parent 8833933ebe
commit 4f6f7286c0
8 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/AbstractTPQConfigValidatorParameterPattern.java → ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/AbstractTPQCheckParameterPattern.java
View file

@ -35,7 +35,7 @@ import net.forwardfire.tpquery.model.TPQueryParameter;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 June 1, 2015 * @version 1.0 June 1, 2015
*/ */
public abstract class AbstractTPQConfigValidatorParameterPattern implements TPQConfigValidatorCheck { public abstract class AbstractTPQCheckParameterPattern implements TPQConfigValidatorCheck {
private final String pattern; private final String pattern;
private final Function<TPQueryParameter,String> patternValue; private final Function<TPQueryParameter,String> patternValue;
@ -45,7 +45,7 @@ public abstract class AbstractTPQConfigValidatorParameterPattern implements TPQC
* @param pattern The pattern to check. * @param pattern The pattern to check.
* @param patternValue The function to get value to check. * @param patternValue The function to get value to check.
*/ */
public AbstractTPQConfigValidatorParameterPattern(String pattern,Function<TPQueryParameter,String> patternValue) { public AbstractTPQCheckParameterPattern(String pattern,Function<TPQueryParameter,String> patternValue) {
Validate.notNull(patternValue); Validate.notNull(patternValue);
this.pattern=pattern; this.pattern=pattern;
this.patternValue=patternValue; this.patternValue=patternValue;

2
ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckDescriptionNotBlank.java → ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQCheckDescriptionNotBlank.java
View file

@ -32,7 +32,7 @@ import net.forwardfire.tpquery.model.TPQuery;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 June 1, 2015 * @version 1.0 June 1, 2015
*/ */
public final class TPQConfigValidatorCheckDescriptionNotBlank implements TPQConfigValidatorCheck { public final class TPQCheckDescriptionNotBlank implements TPQConfigValidatorCheck {
@Override @Override
public void validateQuery(TPQuery query) { public void validateQuery(TPQuery query) {

4
ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckNamePattern.java → ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQCheckNamePattern.java
View file

@ -32,7 +32,7 @@ import net.forwardfire.tpquery.model.TPQuery;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 June 1, 2015 * @version 1.0 June 1, 2015
*/ */
public final class TPQConfigValidatorCheckNamePattern implements TPQConfigValidatorCheck { public final class TPQCheckNamePattern implements TPQConfigValidatorCheck {
private final String pattern; private final String pattern;
@ -40,7 +40,7 @@ public final class TPQConfigValidatorCheckNamePattern implements TPQConfigValida
* Creates an name pattern checker. * Creates an name pattern checker.
* @param pattern The pattern to check the name against. * @param pattern The pattern to check the name against.
*/ */
public TPQConfigValidatorCheckNamePattern(String pattern) { public TPQCheckNamePattern(String pattern) {
Validate.matchesPattern("", pattern); Validate.matchesPattern("", pattern);
this.pattern=pattern; this.pattern=pattern;
} }

2
ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterDefaultValueNotBlank.java → ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQCheckParameterDefaultValueNotBlank.java
View file

@ -32,7 +32,7 @@ import net.forwardfire.tpquery.model.TPQuery;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 June 1, 2015 * @version 1.0 June 1, 2015
*/ */
public final class TPQConfigValidatorCheckParameterDefaultValueNotBlank implements TPQConfigValidatorCheck { public final class TPQCheckParameterDefaultValueNotBlank implements TPQConfigValidatorCheck {
@Override @Override
public void validateQuery(TPQuery query) { public void validateQuery(TPQuery query) {

4
ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterNamePattern.java → ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQCheckParameterNamePattern.java
View file

@ -28,13 +28,13 @@ package net.forwardfire.tpquery.config.validate;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 June 1, 2015 * @version 1.0 June 1, 2015
*/ */
public final class TPQConfigValidatorCheckParameterNamePattern extends AbstractTPQConfigValidatorParameterPattern { public final class TPQCheckParameterNamePattern extends AbstractTPQCheckParameterPattern {
/** /**
* Creates an name pattern checker. * Creates an name pattern checker.
* @param pattern The pattern to check the name against. * @param pattern The pattern to check the name against.
*/ */
public TPQConfigValidatorCheckParameterNamePattern(String pattern) { public TPQCheckParameterNamePattern(String pattern) {
super(pattern,p -> p.getName()); super(pattern,p -> p.getName());
} }
} }

4
ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterTypePattern.java → ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQCheckParameterTypePattern.java
View file

@ -28,13 +28,13 @@ package net.forwardfire.tpquery.config.validate;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 June 1, 2015 * @version 1.0 June 1, 2015
*/ */
public final class TPQConfigValidatorCheckParameterTypePattern extends AbstractTPQConfigValidatorParameterPattern { public final class TPQCheckParameterTypePattern extends AbstractTPQCheckParameterPattern {
/** /**
* Creates an type pattern checker. * Creates an type pattern checker.
* @param pattern The pattern to check the type against. * @param pattern The pattern to check the type against.
*/ */
public TPQConfigValidatorCheckParameterTypePattern(String pattern) { public TPQCheckParameterTypePattern(String pattern) {
super(pattern,p -> p.getType()); super(pattern,p -> p.getType());
} }
} }

4
ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQConfigValidatorCheckParameterValueTypePattern.java → ff-tpquery-store/src/main/java/net/forwardfire/tpquery/config/validate/TPQCheckParameterValueTypePattern.java
View file

@ -28,13 +28,13 @@ package net.forwardfire.tpquery.config.validate;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 June 1, 2015 * @version 1.0 June 1, 2015
*/ */
public final class TPQConfigValidatorCheckParameterValueTypePattern extends AbstractTPQConfigValidatorParameterPattern { public final class TPQCheckParameterValueTypePattern extends AbstractTPQCheckParameterPattern {
/** /**
* Creates an value type pattern checker. * Creates an value type pattern checker.
* @param pattern The pattern to check the value type against. * @param pattern The pattern to check the value type against.
*/ */
public TPQConfigValidatorCheckParameterValueTypePattern(String pattern) { public TPQCheckParameterValueTypePattern(String pattern) {
super(pattern,p -> p.getValueType()); super(pattern,p -> p.getValueType());
} }
} }

28
ff-tpquery-store/src/test/java/net/forwardfire/tpquery/config/TPQueryStoreConfigValidatorTest.java
View file

@ -8,12 +8,12 @@ import net.forwardfire.tpquery.TPQManager;
import net.forwardfire.tpquery.TPQFactory; import net.forwardfire.tpquery.TPQFactory;
import net.forwardfire.tpquery.config.validate.TPQConfigValidator; import net.forwardfire.tpquery.config.validate.TPQConfigValidator;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheck; import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheck;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheckDescriptionNotBlank; import net.forwardfire.tpquery.config.validate.TPQCheckDescriptionNotBlank;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheckNamePattern; import net.forwardfire.tpquery.config.validate.TPQCheckNamePattern;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheckParameterDefaultValueNotBlank; import net.forwardfire.tpquery.config.validate.TPQCheckParameterDefaultValueNotBlank;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheckParameterNamePattern; import net.forwardfire.tpquery.config.validate.TPQCheckParameterNamePattern;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheckParameterTypePattern; import net.forwardfire.tpquery.config.validate.TPQCheckParameterTypePattern;
import net.forwardfire.tpquery.config.validate.TPQConfigValidatorCheckParameterValueTypePattern; import net.forwardfire.tpquery.config.validate.TPQCheckParameterValueTypePattern;
import net.forwardfire.tpquery.model.TPQuery; import net.forwardfire.tpquery.model.TPQuery;
public class TPQueryStoreConfigValidatorTest { public class TPQueryStoreConfigValidatorTest {
@ -41,10 +41,10 @@ public class TPQueryStoreConfigValidatorTest {
.build() .build()
.build(); .build();
config.addConfigValidator(".*", new TPQConfigValidatorCheckNamePattern(".*")); config.addConfigValidator(".*", new TPQCheckNamePattern(".*"));
config.addConfigValidator(".*", new TPQConfigValidatorCheckParameterNamePattern(".*")); config.addConfigValidator(".*", new TPQCheckParameterNamePattern(".*"));
config.addConfigValidator(".*", new TPQConfigValidatorCheckParameterTypePattern(".*")); config.addConfigValidator(".*", new TPQCheckParameterTypePattern(".*"));
config.addConfigValidator(".*", new TPQConfigValidatorCheckParameterValueTypePattern(".*")); config.addConfigValidator(".*", new TPQCheckParameterValueTypePattern(".*"));
config.addConfigValidator(".*", new TPQConfigValidatorCheck() { config.addConfigValidator(".*", new TPQConfigValidatorCheck() {
@Override @Override
public void validateQuery(TPQuery query) { public void validateQuery(TPQuery query) {
@ -70,10 +70,10 @@ public class TPQueryStoreConfigValidatorTest {
.build() .build()
.build(); .build();
TPQConfigValidator t = config.addConfigValidator("junit.test", new TPQConfigValidatorCheckDescriptionNotBlank()); TPQConfigValidator t = config.addConfigValidator("junit.test", new TPQCheckDescriptionNotBlank());
config.removeConfigValidator(t); config.removeConfigValidator(t);
config.addConfigValidator(".*", new TPQConfigValidatorCheckDescriptionNotBlank()); config.addConfigValidator(".*", new TPQCheckDescriptionNotBlank());
TPQManager manager = TPQFactory.createManager(config); TPQManager manager = TPQFactory.createManager(config);
assertNotNull(manager); assertNotNull(manager);
} }
@ -98,7 +98,7 @@ public class TPQueryStoreConfigValidatorTest {
.build() .build()
.build() .build()
.build(); .build();
config.addConfigValidator(".*", new TPQConfigValidatorCheckParameterDefaultValueNotBlank()); config.addConfigValidator(".*", new TPQCheckParameterDefaultValueNotBlank());
TPQManager manager = TPQFactory.createManager(config); TPQManager manager = TPQFactory.createManager(config);
assertNotNull(manager); assertNotNull(manager);
} }
@ -123,7 +123,7 @@ public class TPQueryStoreConfigValidatorTest {
.build() .build()
.build() .build()
.build(); .build();
config.addConfigValidator("junit.test-f.*", new TPQConfigValidatorCheckParameterTypePattern("!RAW")); config.addConfigValidator("junit.test-f.*", new TPQCheckParameterTypePattern("!RAW"));
TPQManager manager = TPQFactory.createManager(config); TPQManager manager = TPQFactory.createManager(config);
assertNotNull(manager); assertNotNull(manager);
} }