Skip to content

Commit b7c59f2

Browse files
rmcdougarmcdouga
authored
Merge pull request #36 from 4PointSolutions/20230724_feature_adaptive_forms_submit
20230724 feature adaptive forms submit
2 parents afc05b4 + e5950d5 commit b7c59f2

11 files changed

Lines changed: 1126 additions & 31 deletions

File tree

‎spring/fluentforms-sample-cli-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.1.0</version>
8+
<version>3.1.2</version>
99
<relativePath /> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com._4point.aem.fluentforms</groupId>

‎spring/fluentforms-sample-web-app/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.1.0</version>
8+
<version>3.1.2</version>
99
</parent>
1010
<groupId>com._4point.aem.fluentforms</groupId>
1111
<artifactId>fluentforms-sample-web-app</artifactId>

‎spring/fluentforms-sample-web-app/src/main/java/com/_4point/aem/fluentforms/sampleapp/resources/AfSubmissionHandler.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com._4point.aem.fluentforms.sampleapp.resources;
2+
3+
import java.util.Objects;
4+
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
import org.springframework.stereotype.Component;
8+
9+
import com._4point.aem.fluentforms.spring.AemProxyAfSubmission;
10+
import com._4point.aem.fluentforms.spring.AemProxyAfSubmission.AfSubmissionHandler.SubmitResponse.Response;
11+
12+
@Component
13+
public class AfSubmissionHandler implements AemProxyAfSubmission.AfSubmissionHandler {
14+
private final static Logger logger = LoggerFactory.getLogger(AfSubmissionHandler.class);
15+
public static final String AF_TEMPLATE_NAME = "sample00002test";
16+
17+
@Override
18+
public boolean canHandle(String formName) {
19+
return Objects.equals(AF_TEMPLATE_NAME, formName);
20+
}
21+
22+
@Override
23+
public SubmitResponse processSubmission(Submission submission) {
24+
// TODO: Implement a less trivial submission handler, maybe one that generates and returns a PDF.
25+
logger.atInfo().log("Received submission");
26+
return Response.text("Successful Submit");
27+
}
28+
29+
}

‎spring/fluentforms-sample-web-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/AfSubmissionHandlerTest.java‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
package com._4point.aem.fluentforms.sampleapp.resources;
2+
3+
import static com._4point.testing.matchers.jaxrs.ResponseMatchers.*;
4+
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.hamcrest.Matchers.*;
6+
import static org.junit.jupiter.api.Assertions.*;
7+
8+
import java.net.URI;
9+
import java.util.List;
10+
11+
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
12+
import org.junit.jupiter.api.AfterEach;
13+
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.Test;
15+
import org.springframework.boot.test.context.SpringBootTest;
16+
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
17+
import org.springframework.boot.test.web.server.LocalServerPort;
18+
19+
import com.github.tomakehurst.wiremock.client.WireMock;
20+
import com.github.tomakehurst.wiremock.http.ResponseDefinition;
21+
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
22+
import com.github.tomakehurst.wiremock.junit5.WireMockTest;
23+
import com.github.tomakehurst.wiremock.recording.SnapshotRecordResult;
24+
import com.github.tomakehurst.wiremock.stubbing.StubMapping;
25+
26+
import jakarta.ws.rs.client.ClientBuilder;
27+
import jakarta.ws.rs.client.Entity;
28+
import jakarta.ws.rs.core.MediaType;
29+
import jakarta.ws.rs.core.Response;
30+
import jakarta.ws.rs.core.Response.Status;
31+
32+
@WireMockTest(httpPort = FluentFormsResourcesTest.WIREMOCK_PORT)
33+
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
34+
class AfSubmissionHandlerTest {
35+
public static final String AF_TEMPLATE_NAME = "sample00002test";
36+
private static final String SUBMIT_ADAPTIVE_FORM_SERVICE_PATH = "/aem/content/forms/af/" + AF_TEMPLATE_NAME + "/jcr:content/guideContainer.af.submit.jsp";
37+
38+
private static final boolean WIREMOCK_RECORDING = false;
39+
static final int WIREMOCK_PORT = 5502;
40+
41+
private static final String APPLICATION_PDF = "application/pdf";
42+
private static final MediaType APPLICATION_PDF_TYPE = MediaType.valueOf(APPLICATION_PDF);
43+
44+
@LocalServerPort
45+
private int port;
46+
47+
@BeforeEach
48+
void setUp(WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
49+
if (WIREMOCK_RECORDING) {
50+
WireMock.startRecording(getBaseUriString(4502));
51+
}
52+
}
53+
54+
@AfterEach
55+
void tearDown() throws Exception {
56+
if (WIREMOCK_RECORDING) {
57+
SnapshotRecordResult recordings = WireMock.stopRecording();
58+
List<StubMapping> mappings = recordings.getStubMappings();
59+
System.out.println("Found " + mappings.size() + " recordings.");
60+
for (StubMapping mapping : mappings) {
61+
ResponseDefinition response = mapping.getResponse();
62+
var jsonBody = response.getJsonBody();
63+
System.out.println(jsonBody == null ? "JsonBody is null" : jsonBody.toPrettyString());
64+
}
65+
}
66+
}
67+
68+
@Test
69+
void test() {
70+
var mockData = mockFormData("http://localhost:8080/redirect", "{ \"foo\" : \"bar\"}");
71+
72+
Response response = ClientBuilder.newClient()
73+
.target(getBaseUri(port))
74+
.path(SUBMIT_ADAPTIVE_FORM_SERVICE_PATH)
75+
.queryParam("form", "sample_template.xdp")
76+
.request()
77+
.post(Entity.entity(mockData, mockData.getMediaType()));
78+
79+
assertThat(response, allOf(isStatus(Status.OK), hasMediaType(MediaType.TEXT_PLAIN_TYPE), hasEntityEqualTo("Successful Submit".getBytes())));
80+
}
81+
82+
private static FormDataMultiPart mockFormData(String redirect, String data) {
83+
final FormDataMultiPart getPdfForm = new FormDataMultiPart();
84+
getPdfForm.field("guideContainerPath", "/aem/content/forms/af/" + AF_TEMPLATE_NAME + "/jcr:content/guideContainer")
85+
.field("aemFormComponentPath", "")
86+
.field("_asyncSubmit", "false")
87+
.field("_charset_", "UTF-8")
88+
.field("runtimeLocale", "en")
89+
.field("fileAttachmentMap", "{}")
90+
.field("afSubmissionInfo", "{\"computedMetaInfo\":{},\"stateOverrides\":{},\"signers\":{}}")
91+
.field("TextField1", "TextField1 Contents")
92+
.field("TextField2", "TextField2 Contents")
93+
.field("jcr:data", data)
94+
.field(":redirect", redirect)
95+
.field(":selfUrl", "/aem/content/forms/af/" + AF_TEMPLATE_NAME)
96+
.field("_guideValueMap", "yes")
97+
.field("_guideValuesMap", "{\"textdraw1555538078737\":\"<p style=\\\"text-align: center;\\\"><b>Sample Form</b></p>\\n\",\"TextField1\":\"DFGDFG\",\"TextField2\":\"DFGDG 233\",\"submit\":null}")
98+
.field("_guideAttachments", "")
99+
.field(":cq_csrf_token", "eyJleHAiOjE1NjU2MzUzNzcsImlhdCI6MTU2NTYzNDc3N30.9KB9yPr_mvIfyiwzn5S8mMh-yUzD0-BF99cJR7vW49M");
100+
return getPdfForm;
101+
}
102+
103+
private static String getBaseUriString(int port) {
104+
return getBaseUri(port).toString();
105+
}
106+
107+
private static URI getBaseUri(int port) {
108+
return URI.create("http://localhost:" + port);
109+
}
110+
111+
}

‎spring/fluentforms-spring-boot-autoconfigure/pom.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.1.0</version>
8+
<version>3.1.2</version>
99
<relativePath /> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com._4point.aem.fluentforms</groupId>
@@ -18,6 +18,8 @@
1818
<jasypt.spring.boot.version>3.0.5</jasypt.spring.boot.version>
1919
<jasypt.maven.plugin.version>3.0.5</jasypt.maven.plugin.version>
2020
<fluentforms.version>0.0.2-SNAPSHOT</fluentforms.version>
21+
<fp.hamcrest.matchers.version>0.0.1-SNAPSHOT</fp.hamcrest.matchers.version>
22+
<wiremock.version>2.35.0</wiremock.version>
2123
</properties>
2224

2325
<distributionManagement>
@@ -82,6 +84,18 @@
8284
<artifactId>spring-boot-starter-test</artifactId>
8385
<scope>test</scope>
8486
</dependency>
87+
<dependency>
88+
<groupId>com._4point.testing</groupId>
89+
<artifactId>4point-hamcrest-matchers</artifactId>
90+
<version>${fp.hamcrest.matchers.version}</version>
91+
<scope>test</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>com.github.tomakehurst</groupId>
95+
<artifactId>wiremock-jre8-standalone</artifactId>
96+
<version>${wiremock.version}</version>
97+
<scope>test</scope>
98+
</dependency>
8599
</dependencies>
86100
<build>
87101
<plugins>
@@ -109,6 +123,15 @@
109123
<groupId>org.apache.maven.plugins</groupId>
110124
<artifactId>maven-source-plugin</artifactId>
111125
</plugin>
126+
<plugin>
127+
<groupId>org.apache.maven.plugins</groupId>
128+
<artifactId>maven-surefire-plugin</artifactId>
129+
<configuration>
130+
<excludes>
131+
<exclude/>
132+
</excludes>
133+
</configuration>
134+
</plugin>
112135
</plugins>
113136
</build>
114137
</project>

0 commit comments

Comments
 (0)