Changed jsonb mapping to use JsonNode over String to avoid escaping issues.

Author: kai-niemi

roach-data-jpa-json/pom.xml

@@ -11,10 +11,26 @@
     <artifactId>roach-data-jpa-json</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jdbc</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>

roach-data-jpa-json/src/main/java/io/roach/data/jpa/JpaJsonApplication.java

@@ -0,0 +1,27 @@
+package io.roach.data.jpa;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.core.Ordered;
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
+import org.springframework.hateoas.config.EnableHypermediaSupport;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL)
+@EnableJdbcRepositories
+@EnableAspectJAutoProxy(proxyTargetClass = true)
+@EnableTransactionManagement(order = Ordered.LOWEST_PRECEDENCE - 1) // Bump up one level to enable extra advisors
+@SpringBootApplication
+public class JpaJsonApplication {
+    protected static final Logger logger = LoggerFactory.getLogger(JpaJsonApplication.class);
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(JpaJsonApplication.class)
+                .web(WebApplicationType.SERVLET)
+                .run(args);
+    }
+}

roach-data-jpa-json/src/main/java/io/roach/data/jpa/chat/ChatHistory.java

@@ -8,16 +8,18 @@
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 import io.roach.data.jpa.support.AbstractJsonDataType;
 
 @Entity
 @Table(name = "chat_history")
 @TypeDef(name = "jsonb-message", typeClass = ChatHistory.StringCollectionJsonType.class)
 public class ChatHistory {
-    public static class StringCollectionJsonType extends AbstractJsonDataType<String> {
+    public static class StringCollectionJsonType extends AbstractJsonDataType<JsonNode> {
         @Override
-        public Class<String> returnedClass() {
-            return String.class;
+        public Class<JsonNode> returnedClass() {
+            return JsonNode.class;
         }
 
         @Override
@@ -37,7 +39,7 @@ public boolean isCollectionType() {
     @Type(type = "jsonb-message")
     @Column(name = "messages")
     @Basic(fetch = FetchType.LAZY)
-    private List<String> messages;
+    private List<JsonNode> messages;
 
     public UUID getId() {
         return id;
@@ -51,11 +53,11 @@ public void setParent(ChatHistory parent) {
         this.parent = parent;
     }
 
-    public List<String> getMessages() {
+    public List<JsonNode> getMessages() {
         return messages;
     }
 
-    public void setMessages(List<String> messages) {
+    public void setMessages(List<JsonNode> messages) {
         this.messages = messages;
     }
 }

roach-data-jpa-json/src/main/java/io/roach/data/jpa/chat/ChatHistoryController.java

@@ -0,0 +1,65 @@
+package io.roach.data.jpa.chat;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.data.web.PagedResourcesAssembler;
+import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.EntityModel;
+import org.springframework.hateoas.PagedModel;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.hateoas.server.SimpleRepresentationModelAssembler;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
+import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
+import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW;
+
+@RestController
+public class ChatHistoryController {
+    @Autowired
+    private ChatHistoryRepository chatHistoryRepository;
+
+    @Autowired
+    private PagedResourcesAssembler<ChatHistory> pagedResourcesAssembler;
+
+    @GetMapping
+    public ResponseEntity<RepresentationModel<?>> index() {
+        RepresentationModel<?> index = new RepresentationModel<>();
+
+        index.add(linkTo(methodOn(ChatHistoryController.class)
+                .listChats(PageRequest.of(0, 5)))
+                .withRel("chats"));
+
+        return new ResponseEntity<>(index, HttpStatus.OK);
+    }
+
+    @GetMapping("/chathistory")
+    @Transactional(propagation = REQUIRES_NEW)
+    public HttpEntity<PagedModel<EntityModel<ChatHistory>>> listChats(
+            @PageableDefault(size = 5, direction = Sort.Direction.ASC) Pageable page) {
+        return ResponseEntity
+                .ok(pagedResourcesAssembler.toModel(chatHistoryRepository.findAll(page), chatModelAssembler()));
+    }
+
+    private SimpleRepresentationModelAssembler<ChatHistory> chatModelAssembler() {
+        return new SimpleRepresentationModelAssembler<ChatHistory>(){
+            @Override
+            public void addLinks(EntityModel<ChatHistory> resource) {
+
+            }
+
+            @Override
+            public void addLinks(CollectionModel<EntityModel<ChatHistory>> resources) {
+
+            }
+        };
+    }
+}

roach-data-jpa-json/src/main/resources/application.yml

@@ -0,0 +1,29 @@
+########################
+# Spring boot properties
+# http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
+########################
+
+spring:
+  output:
+    ansi:
+      enabled: ALWAYS
+
+  liquibase:
+    change-log: classpath:db/changelog-master.xml
+    default-schema:
+    drop-first: false
+    enabled: true
+
+  datasource:
+    url: jdbc:postgresql://localhost:26257/roach_data?sslmode=disable
+    driver-class-name: org.postgresql.Driver
+    username: root
+    password:
+    hikari:
+      connection-test-query: SELECT 1
+
+  jpa:
+    open-in-view: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.CockroachDB201Dialect

roach-data-jpa-json/src/test/resources/db/changelog-master.xml renamed to roach-data-jpa-json/src/main/resources/db/changelog-master.xml

@@ -74,3 +74,9 @@ create table chat_history
 
     INVERTED   INDEX message_payload (messages)
 );
+
+INSERT INTO chat_history (messages) VALUES
+('[
+    {"title": "Sleeping Beauties", "genres": ["Fiction", "Thriller", "Horror"], "published": false},
+    {"title": "The Dictator''s Handbook", "genres": ["Law", "Politics"], "authors": ["Bruce Bueno de Mesquita", "Alastair Smith"], "published": true}
+]');

roach-data-jpa-json/src/test/resources/db/create.sql renamed to roach-data-jpa-json/src/main/resources/db/create.sql

@@ -12,8 +12,8 @@
     <logger name="org.springframework.jdbc.core" level="DEBUG"/>
     <logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG"/>
 
-    <logger name="org.hibernate.SQL" level="DEBUG"/>
-    <logger name="org.hibernate.type.descriptor.sql" level="TRACE"/>
+<!--    <logger name="org.hibernate.SQL" level="DEBUG"/>-->
+<!--    <logger name="org.hibernate.type.descriptor.sql" level="TRACE"/>-->
 
     <logger name="io.roach" level="DEBUG"/>
 

roach-data-jpa-json/src/test/resources/logback.xml renamed to roach-data-jpa-json/src/main/resources/logback.xml

@@ -1,6 +1,9 @@
 package io.roach.data.jpa.chat;
 
+import java.io.IOException;
+import java.io.StringWriter;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.jupiter.api.Order;
@@ -10,38 +13,40 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import io.roach.data.jpa.AbstractIntegrationTest;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import io.roach.data.jpa.AbstractIntegrationTest;
 
 public class ChatHistoryRepositoryTest extends AbstractIntegrationTest {
     @Autowired
     private ChatHistoryRepository chatHistoryRepository;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     @Test
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     @Commit
     @Order(1)
-    public void whenCreatingChatHistory_thenSuccess() {
-        ChatHistory l1 = new ChatHistory();
-        l1.setMessages(Arrays.asList("hello", "world"));
-
-        ChatHistory l2a = new ChatHistory();
-        l2a.setParent(l1);
-        l2a.setMessages(Arrays.asList("hello from", "alice"));
-
-        ChatHistory l2b = new ChatHistory();
-        l2b.setParent(l1);
-        l2b.setMessages(Arrays.asList("hello from", "bob"));
-
-        ChatHistory l3 = new ChatHistory();
-        l3.setParent(l2a);
-        l3.setMessages(Arrays.asList("hello from", "bobby tables"));
-
-        chatHistoryRepository.save(l1);
-        chatHistoryRepository.save(l2a);
-        chatHistoryRepository.save(l2b);
-        chatHistoryRepository.save(l3);
+    public void whenCreatingChatHistory_thenSuccess() throws Exception {
+        String data1 = "{\"title\": \"Sleeping Beauties\", \"genres\": [\"Fiction\", \"Thriller\", \"Horror\"], \"published\": false}";
+        String data2 = "{\"title\": \"The Dictator''s Handbook\", \"genres\": [\"Law\", \"Politics\"], \"authors\": [\"Bruce Bueno de Mesquita\", \"Alastair Smith\"], \"published\": true}";
+        String data3 = "{\"review\": \"A good book\", \"visitor\": \"alice\"}";
+        String data4 = "{\"review\": \"A really good book\", \"visitor\": \"bob\"}";
+
+        ChatHistory h1 = new ChatHistory();
+        h1.setMessages(Arrays.asList(objectMapper.readTree(data1), objectMapper.readTree(data2)));
+
+        ChatHistory h2 = new ChatHistory();
+        h2.setParent(h1);
+        h2.setMessages(Collections.singletonList(objectMapper.readTree(data3)));
+
+        ChatHistory h3 = new ChatHistory();
+        h3.setParent(h1);
+        h3.setMessages(Collections.singletonList(objectMapper.readTree(data4)));
+
+        chatHistoryRepository.saveAll(Arrays.asList(h1, h2, h3));
     }
 
     @Test
@@ -51,8 +56,16 @@ public void whenCreatingChatHistory_thenSuccess() {
     public void whenRetrievingById_thenReturnStuff() {
         List<ChatHistory> chatHistory = chatHistoryRepository.findAll();
         chatHistory.forEach(h -> {
-            List<String> result = h.getMessages();
-            assertEquals(2, result.size());
+            List<JsonNode> result = h.getMessages();
+            result.forEach(jsonNode -> {
+                StringWriter w = new StringWriter();
+                try {
+                    objectMapper.writeValue(w, jsonNode);
+                    System.out.println(w);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            });
         });
     }
 }