Skip to content
This repository was archived by the owner on Dec 18, 2025. It is now read-only.

Commit e0385a8

Browse files
ishaileshmishraishaileshmishra
authored
Merge pull request #4 from contentstack/sonar_vulnerability_fixes
SonarQube Vulnerability Fixes
2 parents 61a08c5 + abc7768 commit e0385a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+66
-2016
lines changed

‎assets/five.png‎

-430 KB
Loading

‎assets/four.png‎

-2.78 MB
Loading

‎assets/one.png‎

-453 KB
Loading

‎assets/seven.png‎

-1.01 MB
Loading

‎assets/six.png‎

-587 KB
Loading

‎assets/three.png‎

-462 KB
Loading

‎assets/two.png‎

-407 KB
Loading

‎src/main/java/com/contentstack/gqlspring/Contentstack.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,22 @@ public class Contentstack {
1515

1616
private static String BASE_URL;
1717
private static String deliverToken;
18+
private static final String ITEMS = "items";
1819

19-
// Loads everytime when new instance is created for the Contentstack class
2020
public Contentstack() {
2121
loadEnvVar();
2222
}
2323

2424
public static <T> T convertToObject(Class<T> clazz, String jsonString) {
2525
try {
2626
ObjectMapper mapper = new ObjectMapper();
27-
return (T) mapper.readValue(jsonString, clazz);
27+
return mapper.readValue(jsonString, clazz);
2828
} catch (Exception e) {
2929
e.printStackTrace();
3030
return null;
3131
}
3232
}
3333

34-
// Loads credential from from .env
3534
private void loadEnvVar() {
3635
Dotenv dotenv = Dotenv.load();
3736
deliverToken = dotenv.get("_EVV_DELIVERY_TOKEN");
@@ -56,11 +55,11 @@ public Object getQuery(@NotNull String query, @NotNull String nodeBy, Class<?> c
5655
.build();
5756

5857
if (cls.isAssignableFrom(BlogListModel[].class) || cls.isAssignableFrom(ArchivedModel[].class)) {
59-
JsonNode jsonNode = gqlInstance.fetch().get("data").get(nodeBy).get("items");
58+
JsonNode jsonNode = gqlInstance.fetch().get("data").get(nodeBy).get(ITEMS);
6059
return toListObject(cls, jsonNode.toString());
6160
}
6261

63-
JsonNode jsonNode = gqlInstance.fetch().get("data").get(nodeBy).get("items").get(0);
62+
JsonNode jsonNode = gqlInstance.fetch().get("data").get(nodeBy).get(ITEMS).get(0);
6463
return convertToObject(cls, jsonNode.toString());
6564

6665
} catch (Exception e) {
@@ -72,7 +71,6 @@ public Object getQuery(@NotNull String query, @NotNull String nodeBy, Class<?> c
7271

7372
private Object toListObject(Class<?> cls, String string) {
7473
try {
75-
//return Arrays.asList(new ObjectMapper().readValue(string, cls)).get(0);
7674
return Collections.singletonList(new ObjectMapper().readValue(string, cls)).get(0);
7775
} catch (JsonProcessingException e) {
7876
e.printStackTrace();
@@ -131,12 +129,11 @@ public Object blogPostById(String id, Class<?> cls) {
131129
" }\n" +
132130
"}")
133131
.setHeader(deliverToken).build();
134-
JsonNode strResponse = graphqlBuilderInstance.fetch().get("data").get("all_blog_post").get("items").get(0);
132+
JsonNode strResponse = graphqlBuilderInstance.fetch().get("data").get("all_blog_post").get(ITEMS).get(0);
135133
return convertToObject(cls, strResponse.toString());
136134
} catch (Exception e) {
137-
System.out.println(e.getMessage());
138135
e.printStackTrace();
139-
return null;
136+
throw new IllegalArgumentException("Invalid = graphql query");
140137
}
141138
}
142139

‎src/main/java/com/contentstack/gqlspring/GraphqlApp.java‎

Lines changed: 53 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@
2020
public class GraphqlApp {
2121

2222
private static Contentstack contentstack;
23+
private static final String AllPage = "all_page";
24+
private static final String ABOUT = "about";
25+
private static final String FOOTER = "footer";
26+
private static final String HEADER = "header";
27+
private static final String HEADER_GRAPHQL = "header.graphql";
28+
private static final String FOOTER_GRAPHQL = "footer.graphql";
29+
private static final String ALL_HEADER = "all_header";
30+
private static final String ALL_FOOTER = "all_footer";
31+
private static final String BANNER = "banner";
2332

2433
public static void main(String[] args) {
2534
contentstack = new Contentstack();
@@ -29,65 +38,65 @@ public static void main(String[] args) {
2938

3039
@GetMapping("/")
3140
public String loadHomePage(Model model) {
32-
String headerQuery = Objects.requireNonNull(Util.load("header.graphql"));
41+
String headerQuery = Objects.requireNonNull(Util.load(HEADER_GRAPHQL));
3342
Object headerResp = contentstack.getQuery(headerQuery,
34-
"all_header", HeaderModel.class);
43+
ALL_HEADER, HeaderModel.class);
3544

3645
String homeQueryString = Objects.requireNonNull(Util.load("home.graphql"));
3746
Object homeResp = contentstack.getQuery(homeQueryString,
38-
"all_page", HomeModel.class);
47+
AllPage, HomeModel.class);
3948

40-
String queryString = Objects.requireNonNull(Util.load("footer.graphql"));
49+
String queryString = Objects.requireNonNull(Util.load(FOOTER_GRAPHQL));
4150
Object footerResp = contentstack.getQuery(queryString,
42-
"all_footer", FooterModel.class);
51+
ALL_FOOTER, FooterModel.class);
4352

44-
model.addAttribute("about", "home");
45-
model.addAttribute("banner", "home");
46-
model.addAttribute("header", headerResp);
53+
model.addAttribute(ABOUT, "home");
54+
model.addAttribute(BANNER, "home");
55+
model.addAttribute(HEADER, headerResp);
4756
model.addAttribute("data", homeResp);
48-
model.addAttribute("footer", footerResp);
57+
model.addAttribute(FOOTER, footerResp);
4958
return "index";
5059
}
5160

5261
@GetMapping("/about-us")
5362
public String aboutUs(@RequestParam(name = "name", required = false, defaultValue = "World") String name, Model model) {
5463

5564

56-
String headerQuery = Objects.requireNonNull(Util.load("header.graphql"));
65+
String headerQuery = Objects.requireNonNull(Util.load(HEADER_GRAPHQL));
5766
Object headerResp = contentstack.getQuery(headerQuery,
58-
"all_header", HeaderModel.class);
67+
ALL_HEADER, HeaderModel.class);
5968

6069
String aboutQuery = Objects.requireNonNull(Util.load("about_us.graphql"));
6170
Object aboutResp = contentstack.getQuery(aboutQuery,
62-
"all_page", HomeModel.class);
71+
AllPage, HomeModel.class);
6372

64-
String queryString = Objects.requireNonNull(Util.load("footer.graphql"));
73+
String queryString = Objects.requireNonNull(Util.load(FOOTER_GRAPHQL));
6574
Object footerResp = contentstack.getQuery(queryString,
66-
"all_footer", FooterModel.class);
75+
ALL_FOOTER, FooterModel.class);
6776

6877

69-
if (headerResp == null || aboutResp == null || footerResp == null) {
78+
if (headerResp == null | aboutResp == null | footerResp == null) {
7079
model.addAttribute("home", "Could not fetch About page..");
7180
} else {
72-
model.addAttribute("about", "about");
73-
model.addAttribute("banner", "home");
74-
model.addAttribute("header", headerResp);
81+
model.addAttribute(ABOUT, ABOUT);
82+
model.addAttribute(BANNER, "home");
83+
model.addAttribute(HEADER, headerResp);
7584
model.addAttribute("data", aboutResp);
76-
model.addAttribute("footer", footerResp);
85+
model.addAttribute(FOOTER, footerResp);
7786
}
7887
return "about-us";
7988
}
8089

8190
@GetMapping("/blog")
8291
public String blogs(Model model) {
8392

84-
String headerQuery = Objects.requireNonNull(Util.load("header.graphql"));
93+
String headerQuery = Objects.requireNonNull(Util.load(HEADER_GRAPHQL));
8594
Object headerResp = contentstack.getQuery(headerQuery,
86-
"all_header", HeaderModel.class);
95+
ALL_HEADER, HeaderModel.class);
8796

8897
String blogQuery = Objects.requireNonNull(Util.load("getblogs.graphql"));
8998
Object blogResp = contentstack.getQuery(blogQuery,
90-
"all_page", BlogModel.class);
99+
AllPage, BlogModel.class);
91100

92101

93102
String archivedBlogsQuery = Objects.requireNonNull(Util.load("archived.graphql"));
@@ -98,20 +107,20 @@ public String blogs(Model model) {
98107
Object allBlogListResp = contentstack.getQuery(allBlogListQuery,
99108
"all_blog_post", BlogListModel[].class);
100109

101-
String queryString = Objects.requireNonNull(Util.load("footer.graphql"));
110+
String queryString = Objects.requireNonNull(Util.load(FOOTER_GRAPHQL));
102111
Object footerResp = contentstack.getQuery(queryString,
103-
"all_footer", FooterModel.class);
112+
ALL_FOOTER, FooterModel.class);
104113

105114

106-
if (headerResp == null || blogResp == null || archivedBlogsResp == null || allBlogListResp == null || footerResp == null) {
115+
if (headerResp == null | blogResp == null | archivedBlogsResp == null | allBlogListResp == null | footerResp == null) {
107116
model.addAttribute("home", "Could not fetch Blog page..");
108117
} else {
109-
model.addAttribute("banner", "blog");
110-
model.addAttribute("header", headerResp);
118+
model.addAttribute(BANNER, "blog");
119+
model.addAttribute(HEADER, headerResp);
111120
model.addAttribute("data", blogResp);
112121
model.addAttribute("archived", archivedBlogsResp);
113122
model.addAttribute("blogList", allBlogListResp);
114-
model.addAttribute("footer", footerResp);
123+
model.addAttribute(FOOTER, footerResp);
115124
}
116125
return "blog";
117126
}
@@ -122,22 +131,22 @@ public String contact(Model model) {
122131

123132
String headerQuery = Objects.requireNonNull(Util.load("header.graphql"));
124133
Object headerResp = contentstack.getQuery(headerQuery,
125-
"all_header", HeaderModel.class);
134+
ALL_HEADER, HeaderModel.class);
126135

127136
String contactusQuery = Objects.requireNonNull(Util.load("contact_us.graphql"));
128137
Object contactusResp = contentstack.getQuery(contactusQuery,
129-
"all_page", ContactModel.class);
138+
AllPage, ContactModel.class);
130139

131-
String queryString = Objects.requireNonNull(Util.load("footer.graphql"));
140+
String queryString = Objects.requireNonNull(Util.load(FOOTER_GRAPHQL));
132141
Object footerResp = contentstack.getQuery(queryString,
133-
"all_footer", FooterModel.class);
142+
ALL_FOOTER, FooterModel.class);
134143

135-
if (headerResp == null || footerResp == null | contactusResp == null) {
144+
if (headerResp == null | footerResp == null | contactusResp == null) {
136145
model.addAttribute("home", "Could not fetch Contact page..");
137146
} else {
138-
model.addAttribute("header", headerResp);
147+
model.addAttribute(HEADER, headerResp);
139148
model.addAttribute("data", contactusResp);
140-
model.addAttribute("footer", footerResp);
149+
model.addAttribute(FOOTER, footerResp);
141150

142151
}
143152
return "contact-us";
@@ -147,28 +156,28 @@ public String contact(Model model) {
147156
@GetMapping("/blog/{id}")
148157
public String blogPost(@PathVariable String id, Model model) {
149158

150-
String headerQuery = Objects.requireNonNull(Util.load("header.graphql"));
159+
String headerQuery = Objects.requireNonNull(Util.load(HEADER_GRAPHQL));
151160
Object headerResp = contentstack.getQuery(headerQuery,
152-
"all_header", HeaderModel.class);
161+
ALL_HEADER, HeaderModel.class);
153162

154163
Object blogPostResp = contentstack.blogPostById("/blog/" + id, BlogPostModel.class);
155164

156165
String blogQuery = Objects.requireNonNull(Util.load("blog_query.graphql"));
157166
Object blogResp = contentstack.getQuery(blogQuery,
158-
"all_page", CustomBlogModel.class);
167+
AllPage, CustomBlogModel.class);
159168

160-
String queryString = Objects.requireNonNull(Util.load("footer.graphql"));
169+
String queryString = Objects.requireNonNull(Util.load(FOOTER_GRAPHQL));
161170
Object footerResp = contentstack.getQuery(queryString,
162-
"all_footer", FooterModel.class);
171+
ALL_FOOTER, FooterModel.class);
163172

164-
if (headerResp == null || blogPostResp == null || blogResp == null || footerResp == null) {
173+
if (headerResp == null | blogPostResp == null | blogResp == null | footerResp == null) {
165174
model.addAttribute("blog post", "Could not fetch Blog post page..");
166175
} else {
167-
model.addAttribute("banner", "blog");
168-
model.addAttribute("header", headerResp);
176+
model.addAttribute(BANNER, "blog");
177+
model.addAttribute(HEADER, headerResp);
169178
model.addAttribute("blogPost", blogPostResp);
170179
model.addAttribute("data", blogResp);
171-
model.addAttribute("footer", footerResp);
180+
model.addAttribute(FOOTER, footerResp);
172181
}
173182
return "blog-post";
174183
}

‎src/main/java/com/contentstack/gqlspring/GraphqlBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public GraphqlBuilder(Builder builder) {
2020
this.tag = builder.tag;
2121
this.url = builder.url;
2222
this.queryJson = builder.queryJson;
23-
this.headers = builder.headers;
23+
this.headers = builder.httpHeaders;
2424
}
2525

2626
@Override
@@ -47,7 +47,7 @@ public static class Builder {
4747
private String tag;
4848
private String url;
4949
private JSONObject queryJson = new JSONObject();
50-
private HttpHeaders headers = new HttpHeaders();
50+
private HttpHeaders httpHeaders = new HttpHeaders();
5151

5252
private Builder() {
5353
}
@@ -81,7 +81,7 @@ public Builder setHeader(String access_token) {
8181
acceptableMediaTypes.add(MediaType.APPLICATION_JSON);
8282
headers.setAccept(acceptableMediaTypes);
8383
headers.add("access_token", access_token);
84-
this.headers = headers;
84+
this.httpHeaders = headers;
8585
return this;
8686
}
8787

0 commit comments

Comments
 (0)