diff options
4 files changed, 17 insertions, 9 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java index 585fb6902ab..09f01a605b4 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationFile.java @@ -11,10 +11,10 @@ import java.util.List; * An application file represents a file within an application package. This class can be used to traverse the entire * application package file structure, as well as read and write files to it, and create directories. * - * @author lulf - * @since 5.1 + * @author Ulf Lillengen */ public abstract class ApplicationFile implements Comparable<ApplicationFile> { + private static final String metaDir = ".meta"; public static final String ContentStatusNew = "new"; public static final String ContentStatusChanged = "changed"; @@ -154,6 +154,7 @@ public abstract class ApplicationFile implements Comparable<ApplicationFile> { public abstract MetaData getMetaData(); public static class MetaData { + public String status = "unknown"; public String md5 = ""; @@ -173,7 +174,8 @@ public abstract class ApplicationFile implements Comparable<ApplicationFile> { } } - public static interface PathFilter { + public interface PathFilter { boolean accept(Path path); } + } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java index 5b3ce7136d5..66be376271a 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankingConstant.java @@ -9,6 +9,7 @@ import com.yahoo.tensor.TensorType; * @author arnej */ public class RankingConstant { + /** The search definition-unique name of this constant */ private final String name; private TensorType tensorType = null; @@ -45,4 +46,5 @@ public class RankingConstant { .append("'"); return b.toString(); } + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java index 5b88361c15b..2c30e271953 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; * @author Vegard Sjonfjell */ public class ConstantTensorJsonValidator { + private static final String FIELD_CELLS = "cells"; private static final String FIELD_ADDRESS = "address"; private static final String FIELD_VALUE = "value"; @@ -43,7 +44,7 @@ public class ConstantTensorJsonValidator { } @FunctionalInterface - private static interface SubroutineThrowingIOException { + private interface SubroutineThrowingIOException { void invoke() throws IOException; } @@ -210,4 +211,5 @@ public class ConstantTensorJsonValidator { throw new InvalidConstantTensor(parser, String.format("Expected field name \"%s\", got \"%s\"", wantedFieldName, actualFieldName)); } } + } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java index 7cc37938658..6b686526532 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankingConstantsValidator.java @@ -19,6 +19,7 @@ import java.io.Reader; */ public class RankingConstantsValidator extends Validator { + private static class ExceptionMessageCollector { public String combinedMessage; public boolean exceptionsOccurred = false; @@ -42,8 +43,8 @@ public class RankingConstantsValidator extends Validator { @Override public void validate(VespaModel model, DeployState deployState) { - final ApplicationPackage applicationPackage = deployState.getApplicationPackage(); - final ExceptionMessageCollector exceptionMessageCollector = new ExceptionMessageCollector("Failed to validate constant tensor file(s):"); + ApplicationPackage applicationPackage = deployState.getApplicationPackage(); + ExceptionMessageCollector exceptionMessageCollector = new ExceptionMessageCollector("Failed to validate constant tensor file(s):"); for (SearchDefinition sd : deployState.getSearchDefinitions()) { for (RankingConstant rc : sd.getSearch().getRankingConstants()) { @@ -60,11 +61,12 @@ public class RankingConstantsValidator extends Validator { } } - public static void validateRankingConstant(RankingConstant rankingConstant, ApplicationPackage applicationPackage) throws FileNotFoundException { - final ApplicationFile tensorApplicationFile = applicationPackage.getFile(Path.fromString(rankingConstant.getFileName())); - final Reader tensorReader = tensorApplicationFile.createReader(); + private void validateRankingConstant(RankingConstant rankingConstant, ApplicationPackage applicationPackage) throws FileNotFoundException { + ApplicationFile tensorApplicationFile = applicationPackage.getFile(Path.fromString(rankingConstant.getFileName())); + Reader tensorReader = tensorApplicationFile.createReader(); ConstantTensorJsonValidator tensorValidator = new ConstantTensorJsonValidator(tensorReader, rankingConstant.getTensorType()); tensorValidator.validate(); } + }
\ No newline at end of file |