UNOMI-879 Unified CRUD Karaf shell developer commands (includes UNOMI-920 YAML toString() debugging)

api/src/main/java/org/apache/unomi/api/services/EventService.java

@@ -153,4 +153,11 @@ public interface EventService {
      * @param profileId identifier of the profile that we want to remove it's events
      */
     void removeProfileEvents(String profileId);
+
+    /**
+     * Deletes the event identified by the given identifier from persistence.
+     *
+     * @param eventIdentifier the unique identifier for the event
+     */
+    void deleteEvent(String eventIdentifier);
 }

api/src/main/java/org/apache/unomi/api/services/ProfileService.java

@@ -217,6 +217,15 @@ default Session loadSession(String sessionId) {
      */
     void removeProfileSessions(String profileId);
 
+    /**
+     * Deletes the session identified by the given identifier from persistence.
+     * Note: events belonging to this session are NOT removed; they remain in persistence
+     * with a dangling sessionId reference.
+     *
+     * @param sessionIdentifier the unique identifier for the session
+     */
+    void deleteSession(String sessionIdentifier);
+
     /**
      * Checks whether the specified profile and/or session satisfy the specified condition.
      *

itests/src/test/java/org/apache/unomi/itests/graphql/GraphQLListIT.java

@@ -21,14 +21,10 @@
 import org.apache.unomi.lists.UserList;
 import org.junit.Assert;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import java.util.Objects;
 
 public class GraphQLListIT extends BaseGraphQLIT {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GraphQLListIT.class);
-
     @Test
     public void testCRUD() throws Exception {
         Profile persistedProfile = null;
@@ -86,7 +82,6 @@ public void testCRUD() throws Exception {
                         try (CloseableHttpResponse response = post("graphql/list/find-lists.json")) {
                             return ResponseContext.parse(response.getEntity());
                         } catch (Exception e) {
-                            LOGGER.warn("find-lists poll attempt failed: {}", e.getMessage());
                             return null;
                         }
                     },
@@ -108,7 +103,7 @@ public void testCRUD() throws Exception {
             try (CloseableHttpResponse response = post("graphql/list/delete-list.json")) {
                 final ResponseContext context = ResponseContext.parse(response.getEntity());
 
-                Assert.assertTrue("testListId", context.getValue("data.cdp.deleteList"));
+                Assert.assertTrue("deleteList should return true", Boolean.TRUE.equals(context.getValue("data.cdp.deleteList")));
             }
         } finally {
             if (persistedProfile != null) {

services/src/main/java/org/apache/unomi/services/impl/events/EventServiceImpl.java

@@ -336,4 +336,9 @@ public void removeProfileEvents(String profileId){
 
         persistenceService.removeByQuery(profileCondition,Event.class);
     }
+
+    @Override
+    public void deleteEvent(String eventIdentifier) {
+        persistenceService.remove(eventIdentifier, Event.class);
+    }
 }

services/src/main/java/org/apache/unomi/services/impl/profiles/ProfileServiceImpl.java

@@ -1015,6 +1015,11 @@ public void removeProfileSessions(String profileId) {
         persistenceService.removeByQuery(profileCondition, Session.class);
     }
 
+    @Override
+    public void deleteSession(String sessionIdentifier) {
+        persistenceService.remove(sessionIdentifier, Session.class);
+    }
+
     @Override
     public boolean matchCondition(Condition condition, Profile profile, Session session) {
         ParserHelper.resolveConditionType(definitionsService, condition, "profile " + profile.getItemId() + " matching");

tools/shell-dev-commands/pom.xml

@@ -92,13 +92,19 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient-osgi</artifactId>
+            <version>${httpclient-osgi.version}</version>
+            <type>bundle</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -115,6 +121,14 @@
                 <configuration>
                     <instructions>
                         <Karaf-Commands>*</Karaf-Commands>
+                        <Export-Package>
+                            org.apache.unomi.shell.dev.services,
+                            org.apache.unomi.shell.dev.commands
+                        </Export-Package>
+                        <_dsannotations>*</_dsannotations>
+                        <_dsannotations-options>inherit</_dsannotations-options>
+                        <_metatypeannotations>*</_metatypeannotations>
+                        <_metatypeannotations-options>version;nested</_metatypeannotations-options>
                     </instructions>
                 </configuration>
             </plugin>