From bb60156223357b204d09bc1b0575649c60439fbc Mon Sep 17 00:00:00 2001 From: Eric Vergnaud Date: Mon, 30 Aug 2021 19:54:16 +0200 Subject: [PATCH] Fix updated API --- .../main/java/prompto/store/mongo/MongoStore.java | 2 +- .../prompto/store/mongo/PromptoVersionCodec.java | 2 +- .../src/test/java/prompto/code/TestCodeStore.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MongoStore/src/main/java/prompto/store/mongo/MongoStore.java b/MongoStore/src/main/java/prompto/store/mongo/MongoStore.java index 8c8dfe4e..83f2703e 100644 --- a/MongoStore/src/main/java/prompto/store/mongo/MongoStore.java +++ b/MongoStore/src/main/java/prompto/store/mongo/MongoStore.java @@ -729,7 +729,7 @@ public void flush() throws PromptoError { readers.put(Family.DATETIME, (o)->o instanceof Document ? PromptoDateTime.parse(((Document)o).getString("text")) : null); readers.put(Family.BLOB, MongoStore::binaryToPromptoBinary); readers.put(Family.IMAGE, MongoStore::binaryToPromptoBinary); - readers.put(Family.VERSION, (o)->PromptoVersion.parse((int)o)); + readers.put(Family.VERSION, (o)->PromptoVersion.parseInt((int)o)); } static Object binaryToPromptoBinary(Object o) { diff --git a/MongoStore/src/main/java/prompto/store/mongo/PromptoVersionCodec.java b/MongoStore/src/main/java/prompto/store/mongo/PromptoVersionCodec.java index 54272793..ae86209f 100644 --- a/MongoStore/src/main/java/prompto/store/mongo/PromptoVersionCodec.java +++ b/MongoStore/src/main/java/prompto/store/mongo/PromptoVersionCodec.java @@ -23,7 +23,7 @@ public Class getEncoderClass() { @Override public PromptoVersion decode(BsonReader reader, DecoderContext decoderContext) { - return PromptoVersion.parse(reader.readInt32()); + return PromptoVersion.parseInt(reader.readInt32()); } @Override diff --git a/Server/src/test/java/prompto/code/TestCodeStore.java b/Server/src/test/java/prompto/code/TestCodeStore.java index 8d89bb11..2e34eb65 100644 --- a/Server/src/test/java/prompto/code/TestCodeStore.java +++ b/Server/src/test/java/prompto/code/TestCodeStore.java @@ -59,9 +59,9 @@ public void fetchesDeclarationsWithAnnotationsFromMemStore() throws Exception { Mode.set(Mode.UNITTEST); ICodeStore codeStore = Standalone.bootstrapCodeStore(new MemStore(), newRuntimeConfig(null)); DeclarationList read = parseEResource("prompto/graphQLMethods.pec"); - codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parse(1), null); - codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parse(2), null); - codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parse(1), "Other"); + codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parseInt(1), null); + codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parseInt(2), null); + codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parseInt(1), "Other"); Context context = Context.newGlobalsContext(); Iterable decls = context.getRegisteredDeclarationsWithAnnotations("@GraphQLQuery", "@GraphQLMutation"); Set names = StreamSupport.stream(decls.spliterator(), false).map(IDeclaration::getName).collect(Collectors.toSet()); @@ -75,9 +75,9 @@ public void fetchesDeclarationsWithAnnotationsFromMongoStore() throws Exception Mode.set(Mode.UNITTEST); ICodeStore codeStore = Standalone.bootstrapCodeStore(store, newRuntimeConfig(null)); DeclarationList read = parseEResource("prompto/graphQLMethods.pec"); - codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parse(1), null); - codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parse(2), null); - codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parse(1), "Other"); + codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parseInt(1), null); + codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parseInt(2), null); + codeStore.storeDeclarations(read, Dialect.E, PromptoVersion.parseInt(1), "Other"); Context context = Context.newGlobalsContext(); Iterable decls = context.getRegisteredDeclarationsWithAnnotations("@GraphQLQuery", "@GraphQLMutation"); Set names = StreamSupport.stream(decls.spliterator(), false).map(IDeclaration::getName).collect(Collectors.toSet()); @@ -100,7 +100,7 @@ private IRuntimeConfiguration newRuntimeConfig(String testResourcePath) { runtimeLibs.add(Thread.currentThread().getContextClassLoader().getResource(testResourcePath)); return new IRuntimeConfiguration.Inline() .withApplicationName("TestCodeStore") - .withApplicationVersion(PromptoVersion.parse(1)) + .withApplicationVersion(PromptoVersion.parseInt(1)) .withRuntimeLibs(()->runtimeLibs); } }