[sling-org-apache-sling-feature-cpconverter] branch master updated: SLING-11764 adding jcr:primaryType as nt:file (#155)

[rombert]

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

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git


The following commit(s) were added to refs/heads/master by this push:
     new c46ad54  SLING-11764 adding jcr:primaryType as nt:file (#155)
c46ad54 is described below

commit c46ad543fd08fd7257ba5dca294dd90b059d46fb
Author: Abhishek Garg <abhishek18g...@gmail.com>
AuthorDate: Thu Feb 2 15:05:15 2023 +0530

    SLING-11764 adding jcr:primaryType as nt:file (#155)
    
    Co-authored-by: Abhishek Garg <abhigarg@Abhisheks-MacBook-Pro-2.local>
---
 .../feature/cpconverter/index/IndexDefinitionsJsonWriter.java      | 1 +
 .../feature/cpconverter/index/IndexDefinitionsJsonWriterTest.java  | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git 
a/src/main/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriter.java
 
b/src/main/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriter.java
index b386c70..991ff2d 100644
--- 
a/src/main/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriter.java
+++ 
b/src/main/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriter.java
@@ -141,6 +141,7 @@ public class IndexDefinitionsJsonWriter {
         // in this case, this is the nt:resource node
         Optional<byte[]> binary = indexDefinitions.getBinary(nodePath);
         if ( binary.isPresent() ) {
+            write(json, JcrConstants.JCR_PRIMARYTYPE, 
Collections.singletonList(JcrConstants.NT_FILE),  s -> Json.createValue("nam:" 
+ s ));
             json.writeStartObject(JcrConstants.JCR_CONTENT);
             String blobAsString = new String(binary.get(), 
StandardCharsets.UTF_8);
             write(json, JcrConstants.JCR_PRIMARYTYPE, 
Collections.singletonList(JcrConstants.NT_RESOURCE),  s -> 
Json.createValue("nam:" + s ));
diff --git 
a/src/test/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriterTest.java
 
b/src/test/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriterTest.java
index c32eaba..a42b41f 100644
--- 
a/src/test/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriterTest.java
+++ 
b/src/test/java/org/apache/sling/feature/cpconverter/index/IndexDefinitionsJsonWriterTest.java
@@ -178,6 +178,13 @@ public class IndexDefinitionsJsonWriterTest {
         assertThat(configNode).as("config node")
             .hasEntrySatisfying("jcr:resource", Conditions.isJsonObject());
 
+        assertThat(configNode).as("config node has " + 
JcrConstants.JCR_PRIMARYTYPE)
+                .containsKey(JcrConstants.JCR_PRIMARYTYPE);
+
+        JsonString jcrPrimaryType = 
configNode.getJsonString(JcrConstants.JCR_PRIMARYTYPE);
+        assertThat(jcrPrimaryType.toString()).as("jcrPrimaryType property 
contains " + JcrConstants.NT_FILE)
+                .contains(JcrConstants.NT_FILE);
+
         JsonObject configContentNode = 
configNode.getJsonObject(JcrConstants.JCR_CONTENT);
         JsonString binaryEntry = 
configContentNode.getJsonString(JcrConstants.JCR_DATA);
         assertThat(binaryEntry).as("config.xml blob")