Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.contentstack</groupId>
Expand All @@ -16,7 +16,7 @@
<description>Demo project for graphql-springboot-api-integration</description>
<properties>
<java.version>17</java.version>
<spring-boot.version>3.4.1</spring-boot.version>
<spring-boot.version>3.4.2</spring-boot.version>
<json-smart.version>2.5.2</json-smart.version>
</properties>

Expand Down Expand Up @@ -70,7 +70,45 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>1.6.0</version>
<version>2.1.0</version>
</dependency>
<!-- Fix Tomcat vulnerabilities -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>10.1.43</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>10.1.43</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>10.1.43</version>
</dependency>
<!-- Fix Logback vulnerabilities -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.5.13</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.13</version>
</dependency>
<!-- Fix Spring Framework vulnerabilities -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.2.8</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>6.2.8</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/contentstack/gqlspring/GraphqlApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public String aboutUs(@RequestParam(name = "name", required = false, defaultValu
ALL_FOOTER, FooterModel.class);


if (headerResp == null | aboutResp == null | footerResp == null) {
if (headerResp == null || aboutResp == null || footerResp == null) {
model.addAttribute("home", "Could not fetch About page..");
} else {
model.addAttribute(ABOUT, ABOUT);
Expand Down Expand Up @@ -112,7 +112,7 @@ public String blogs(Model model) {
ALL_FOOTER, FooterModel.class);


if (headerResp == null | blogResp == null | archivedBlogsResp == null | allBlogListResp == null | footerResp == null) {
if (headerResp == null || blogResp == null || archivedBlogsResp == null || allBlogListResp == null || footerResp == null) {
model.addAttribute("home", "Could not fetch Blog page..");
} else {
model.addAttribute(BANNER, "blog");
Expand Down Expand Up @@ -141,7 +141,7 @@ public String contact(Model model) {
Object footerResp = contentstack.getQuery(queryString,
ALL_FOOTER, FooterModel.class);

if (headerResp == null | footerResp == null | contactusResp == null) {
if (headerResp == null || footerResp == null || contactusResp == null) {
model.addAttribute("home", "Could not fetch Contact page..");
} else {
model.addAttribute(HEADER, headerResp);
Expand Down Expand Up @@ -170,7 +170,7 @@ public String blogPost(@PathVariable String id, Model model) {
Object footerResp = contentstack.getQuery(queryString,
ALL_FOOTER, FooterModel.class);

if (headerResp == null | blogPostResp == null | blogResp == null | footerResp == null) {
if (headerResp == null || blogPostResp == null || blogResp == null || footerResp == null) {
model.addAttribute("blog post", "Could not fetch Blog post page..");
} else {
model.addAttribute(BANNER, "blog");
Expand Down
Loading