[camel-karavan] 04/07: Remove WARN IPROTO000002 from Infinispan

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git

commit e208f02b84cd41cce47d4f269dd30045044fa076
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Oct 23 19:31:12 2023 -0400

    Remove WARN IPROTO000002 from Infinispan
---
 .../camel/karavan/infinispan/InfinispanService.java      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java
index bfacd49b..30440c1c 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java
@@ -16,12 +16,8 @@
  */
 package org.apache.camel.karavan.infinispan;
 
-import io.smallrye.mutiny.tuples.Tuple2;
 import jakarta.enterprise.inject.Default;
 import jakarta.inject.Singleton;
-import jakarta.transaction.NotSupportedException;
-import jakarta.transaction.SystemException;
-import jakarta.transaction.TransactionManager;
 import org.apache.camel.karavan.infinispan.model.*;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.faulttolerance.Retry;
@@ -35,6 +31,9 @@ import org.infinispan.client.hotrod.configuration.ClientIntelligence;
 import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
 import org.infinispan.commons.configuration.StringConfiguration;
 import org.infinispan.commons.marshall.ProtoStreamMarshaller;
+import org.infinispan.protostream.ProtobufUtil;
+import org.infinispan.protostream.SerializationContext;
+import org.infinispan.protostream.config.Configuration;
 import org.infinispan.query.dsl.QueryFactory;
 import org.jboss.logging.Logger;
 
@@ -84,7 +83,10 @@ public class InfinispanService implements HealthCheck {
     void start() throws Exception {
         LOGGER.info("InfinispanService is starting in remote mode");
 
-        ProtoStreamMarshaller marshaller = new ProtoStreamMarshaller();
+        Configuration.Builder cfgBuilder = Configuration.builder().setLogOutOfSequenceWrites(false);
+        SerializationContext ctx = ProtobufUtil.newSerializationContext(cfgBuilder.build());
+
+        ProtoStreamMarshaller marshaller = new ProtoStreamMarshaller(ctx);
         marshaller.register(new KaravanSchemaImpl());
 
         ConfigurationBuilder builder = new ConfigurationBuilder();
@@ -154,9 +156,9 @@ public class InfinispanService implements HealthCheck {
 
     public ProjectFile getProjectFile(String projectId, String filename) {
         QueryFactory queryFactory = Search.getQueryFactory(files);
-        List<ProjectFile> list = queryFactory.<ProjectFile>create("FROM karavan.ProjectFile WHERE projectId = :projectId AND name = :name")
-                .setParameter("projectId", projectId)
+        List<ProjectFile> list = queryFactory.<ProjectFile>create("FROM karavan.ProjectFile WHERE name = :name AND projectId = :projectId")
                 .setParameter("name", filename)
+                .setParameter("projectId", projectId)
                 .execute().list();
         return list.size() > 0 ? list.get(0) : null;
     }