diff options
5 files changed, 12 insertions, 8 deletions
diff --git a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java index fa9dfe69c5d..73110a06151 100644 --- a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java +++ b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java @@ -59,7 +59,8 @@ public class ApplicationPreprocessor { ApplicationPreprocessor preprocessor = new ApplicationPreprocessor(applicationDir, outputDir, environment, region); try { preprocessor.run(); - System.out.println("Application preprocessed successfully. Preprocessed application stored in " + new File(applicationDir, ".preprocessed").getAbsolutePath()); + System.out.println("Application preprocessed successfully. Preprocessed application stored in " + + new File(applicationDir, ".preprocessed").getAbsolutePath()); } catch (Exception e) { System.err.println("Error validating application package: " + Exceptions.toMessageString(e)); System.exit(1); diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java index e0976c0eaef..60524fbca8d 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java @@ -23,6 +23,7 @@ public class FilesApplicationFile extends ApplicationFile { private static final Logger log = Logger.getLogger("FilesApplicationFile"); private final File file; private final ObjectMapper mapper = new ObjectMapper(); + public FilesApplicationFile(Path path, File file) { super(path); this.file = file; diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java index f5cba0d11a4..4a09b289743 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/TensorFlowFeatureConverter.java @@ -94,7 +94,7 @@ public class TensorFlowFeatureConverter extends ExpressionTransformer<RankProfil private ExpressionNode transformFromStoredModel(ModelStore store, RankProfile profile) { for (RankingConstant constant : store.readRankingConstants()) { - if (!profile.getSearch().getRankingConstants().containsKey(constant.getName())) + if ( ! profile.getSearch().getRankingConstants().containsKey(constant.getName())) profile.getSearch().addRankingConstant(constant); } return store.readConverted().getRoot(); @@ -154,11 +154,11 @@ public class TensorFlowFeatureConverter extends ExpressionTransformer<RankProfil } private void transformConstant(ModelStore store, RankProfile profile, String constantName, Tensor constantValue) { - if (profile.getSearch().getRankingConstants().containsKey(constantName)) return; - Path constantPath = store.writeConstant(constantName, constantValue); - profile.getSearch().addRankingConstant(new RankingConstant(constantName, constantValue.type(), - constantPath.toString())); + + if ( ! profile.getSearch().getRankingConstants().containsKey(constantName)) + profile.getSearch().addRankingConstant(new RankingConstant(constantName, constantValue.type(), + constantPath.toString())); } private String skippedOutputsDescription(TensorFlowModel.Signature signature) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java index c8b6c6e36aa..d69c0084180 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusListResponse.java @@ -15,9 +15,9 @@ import java.util.*; * Status and md5sum for files within an application package. * * @author hmusum - * @since 5.1.15 */ class SessionContentStatusListResponse extends SessionResponse { + private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger("SessionContentStatusListResponse"); private final Slime slime = new Slime(); @@ -38,4 +38,5 @@ class SessionContentStatusListResponse extends SessionResponse { public void render(OutputStream outputStream) throws IOException { new JsonFormat(true).encode(outputStream, slime); } + } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java index 8d4cb95090f..bd182093e99 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentStatusResponse.java @@ -10,9 +10,9 @@ import java.io.*; * Represents a response for a request to show the status and md5sum of a file in the application package. * * @author hmusum - * @since 5.1.15 */ public class SessionContentStatusResponse extends SessionResponse { + private final ApplicationFile file; private final String urlBase; private final ApplicationFile.MetaData metaData; @@ -51,4 +51,5 @@ public class SessionContentStatusResponse extends SessionResponse { this.name = name; } } + } |