Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2207 commits
Select commit Hold shift + click to select a range
d982b58
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 2, 2026
a4e0c69
fix: making sure callback url includes the reverse proxy route (#298)
themaherkhalil Apr 3, 2026
f5f7d4f
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 3, 2026
3880b3e
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 3, 2026
3ba87f6
chore: styled error page on 404 (#299)
themaherkhalil Apr 6, 2026
8171cd0
fix: remove 401, clean up
rithvik-doshi Apr 6, 2026
1b8cf20
fix: remove 401, clean up
rithvik-doshi Apr 6, 2026
8f99b2e
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 6, 2026
cb54274
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 6, 2026
f3c18d2
chore: moving util method, some code formatting (#300)
themaherkhalil Apr 6, 2026
61006f1
feat: better SSE handling on Anthropic Endpoints
ryanweiler92 Apr 7, 2026
204d8d7
Merge pull request #301 from SEMOSS/anthropic-endpoints-better-sse-ha…
ryanweiler92 Apr 7, 2026
07e37b2
fix: moving from lang to lang3 (#302)
themaherkhalil Apr 8, 2026
cee648d
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 8, 2026
b730875
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 8, 2026
bd2acbf
chore: update lz4 jar version
kunal0137 Apr 8, 2026
a93e1a6
only pull parent room id from headers
ryanweiler92 Apr 8, 2026
dbe4c70
chore: exclude assertj
kunal0137 Apr 8, 2026
5e034bd
Merge pull request #303 from SEMOSS/update-lz4-jar
kunal0137 Apr 8, 2026
b70e08d
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 8, 2026
1a31be9
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 8, 2026
2a0b7ad
Merge branch 'dev' into agent-harness-room-management
ryanweiler92 Apr 9, 2026
ebb973d
fix: pin jackson 3.x version
kunal0137 Apr 9, 2026
13a3a42
Merge pull request #304 from SEMOSS/fix-pin-jackson-versions
kunal0137 Apr 9, 2026
a541035
WIP
ryanweiler92 Apr 10, 2026
96887b6
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 13, 2026
12f9136
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 13, 2026
f02b264
chore: removing unused APIFilter (#306)
themaherkhalil Apr 13, 2026
57a60d4
chore: remove unused servlet (#307)
themaherkhalil Apr 13, 2026
5d53efe
chore: removing unused api application (#308)
themaherkhalil Apr 13, 2026
76b3e09
fix: resolving sychronization error and adding javadoc to link saml c…
themaherkhalil Apr 13, 2026
c72984a
fix: forgot to delete filter with PR#309 (#310)
themaherkhalil Apr 13, 2026
fb78ee2
continue conversations
ryanweiler92 Apr 13, 2026
a798e29
Merge branch 'dev' into agent-harness-room-management
ryanweiler92 Apr 13, 2026
371bf47
feat: handle room id on parsed code assistant filter
kunal0137 Apr 14, 2026
f53b49c
Merge pull request #305 from SEMOSS/agent-harness-room-management
kunal0137 Apr 14, 2026
fe8afd7
WIP
ryanweiler92 Apr 15, 2026
bc5c344
fix: null check to avoid npe when checking for room in possibly non-e…
agmontem-devel Apr 16, 2026
e4368d4
Merge pull request #311 from SEMOSS/fix-npe-in-anthropic-endpoints
agmontem-devel Apr 16, 2026
2452099
moving cc history streamer to monolith
ryanweiler92 Apr 16, 2026
620b3fd
Merge branch 'dev' into websockets
ryanweiler92 Apr 16, 2026
a7b4d4a
Merge pull request #312 from SEMOSS/websockets
ryanweiler92 Apr 17, 2026
b6962e5
fix: search term using input sanitizer to allow for @, removing Const…
themaherkhalil Apr 17, 2026
a062e6d
feat: use code build
kunal0137 Apr 17, 2026
380c252
Merge pull request #314 from SEMOSS/feat-code-build-pipelines
kunal0137 Apr 17, 2026
5b6894f
moving find jsonl logic to semoss
ryanweiler92 Apr 17, 2026
ce2a4c2
fix: remove auto comment codium
kunal0137 Apr 17, 2026
289ccd5
Merge branch 'dev' into feat-code-build-pipelines
kunal0137 Apr 17, 2026
fc9942c
Merge pull request #315 from SEMOSS/feat-code-build-pipelines
kunal0137 Apr 17, 2026
6c5f00e
new-file-watch-loop-for-cc
ryanweiler92 Apr 20, 2026
4838990
Merge branch 'dev' into new-file-watch-loop
ryanweiler92 Apr 20, 2026
f00cb2a
moving semoss workflow dispatch to the-actions-org
ryanweiler92 Apr 20, 2026
73050b0
Merge branch 'new-file-watch-loop' of https://github.com/SEMOSS/Monol…
ryanweiler92 Apr 20, 2026
f9844d1
removing propogate-failure from semoss workflow dispatch
ryanweiler92 Apr 20, 2026
1da98e2
fixing-build-constraints
ryanweiler92 Apr 20, 2026
3e62980
Merge pull request #316 from SEMOSS/new-file-watch-loop
ryanweiler92 Apr 20, 2026
0159c9c
Merge branch 'dev' into fix-openai-streaming
kunal0137 Apr 20, 2026
0b62674
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 20, 2026
f61e5c3
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 20, 2026
b2e4de6
chore: Update Tomcat version to 9.0.117
kunal0137 Apr 22, 2026
0617d64
Merge pull request #319 from SEMOSS/update-catalina-jar
kunal0137 Apr 22, 2026
a47429a
fix: removing agent user py process and symlink (#320)
themaherkhalil Apr 22, 2026
7cbb172
fix: track upload of file to engine in local git (#318)
ppatel9703 Apr 22, 2026
0949360
feat: login for servicenow (#297)
snehakumari369 Apr 22, 2026
232a06e
feat: login for jira (#296)
Subhadeepghosh1 Apr 22, 2026
dd864f2
refactor: improve method organization, javadocs, and logging (#321)
themaherkhalil Apr 22, 2026
352e36d
Merge branch 'dev' into fix-openai-streaming
kunal0137 Apr 23, 2026
48440e7
Merge pull request #317 from SEMOSS/fix-openai-streaming
kunal0137 Apr 23, 2026
fb7993f
fix: hard code the response type as function - dont use source type
kunal0137 Apr 24, 2026
68bfa90
Merge pull request #322 from SEMOSS/fix-openai-chat-completions-tool-…
kunal0137 Apr 24, 2026
84bf69e
feat: changes to message emulation for streaming images from openai i…
rithvik-doshi Apr 24, 2026
a4c7e3b
refactor: removing unused user workspace app, removing insight classe…
themaherkhalil Apr 24, 2026
f9ad126
fix: changing class name with modification in semoss source code (#324)
themaherkhalil Apr 24, 2026
3ab936a
refactor: switching to run async pixel in a virtual thread (#325)
themaherkhalil Apr 25, 2026
7787074
fix: adding endpoints to match potential endpoints from clients, mino…
themaherkhalil Apr 26, 2026
b092698
Merge branch 'dev' into openai-image
rithvik-doshi Apr 27, 2026
9da62b7
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 27, 2026
af20f02
Merge branch 'dev' into json-error-servlet
rithvik-doshi Apr 27, 2026
f804d6d
fix: watcher startup as daemon (#328)
themaherkhalil Apr 28, 2026
1fefb8c
handle thought signatures through cc harness
ryanweiler92 Apr 29, 2026
ca73cbd
Merge pull request #329 from SEMOSS/thought-signatures-with-agent-har…
ryanweiler92 Apr 29, 2026
05976b4
Merge branch 'dev' into openai-image
rithvik-doshi May 1, 2026
83efa31
flushing usage tokens
ryanweiler92 May 1, 2026
07f8328
cleanup
ryanweiler92 May 1, 2026
43e8699
Merge pull request #331 from SEMOSS/flush-tokens-anthropic-endpoint
ryanweiler92 May 1, 2026
5a56e42
capture openai token usage on openai endpoints
ryanweiler92 May 4, 2026
3b5db2d
Merge branch 'dev' into capture-tokens-openai-endpoint
ryanweiler92 May 4, 2026
5437a6c
Merge pull request #332 from SEMOSS/capture-tokens-openai-endpoint
ryanweiler92 May 4, 2026
3b5f560
Merge branch 'dev' into openai-image
rithvik-doshi May 4, 2026
2d3a561
fix: thinking blocks need to be dropped from return
kunal0137 May 4, 2026
da0065a
Merge pull request #333 from SEMOSS/fix-drop-thinking-chat-completions
kunal0137 May 4, 2026
56009fe
Merge branch 'dev' into openai-image
rithvik-doshi May 5, 2026
f7fce32
fix: serialization through gson
rithvik-doshi May 5, 2026
a1946b8
fix: revert changes to anthropic helpers
rithvik-doshi May 6, 2026
7e3951c
fix: revert chat completions helper
rithvik-doshi May 6, 2026
b626008
fix: wip responses endpoint work
rithvik-doshi May 6, 2026
3015d6d
fix: images endpoint wip
rithvik-doshi May 6, 2026
bb093b6
fix: wip image endpoints
rithvik-doshi May 6, 2026
f8839ac
fix: gson
rithvik-doshi May 6, 2026
bad7667
fix: making user password reset params more clear, cleanup of log mes…
themaherkhalil May 8, 2026
aad926b
feat: engine resource REST endpoints + shared pixel runner helper (#335)
themaherkhalil May 9, 2026
48c046d
feat: nameserver cleanup, runPython endpoint shortcut, dynamic endpoi…
themaherkhalil May 9, 2026
3db3319
feat: reuse same room from claude code
kunal0137 May 10, 2026
b9787cb
feat: reuse thread id from codex is passed in
kunal0137 May 10, 2026
4ce118a
Merge branch 'dev' into fix-cc-codex-room-handling
kunal0137 May 10, 2026
00ce4cc
Merge pull request #337 from SEMOSS/fix-cc-codex-room-handling
kunal0137 May 10, 2026
206cf88
Merge branch 'dev' into openai-image
rithvik-doshi May 11, 2026
7bf115b
clean up
ryanweiler92 May 11, 2026
d416567
Merge pull request #327 from SEMOSS/openai-image
ryanweiler92 May 11, 2026
00cea93
feat: endpoints to get list and count of api_user's (#339)
themaherkhalil May 22, 2026
087dea2
Merge branch 'dev' into json-error-servlet
rithvik-doshi May 22, 2026
a1a79ab
Merge branch 'dev' into json-error-servlet
rithvik-doshi May 22, 2026
f7e8bcc
fixing-codex-headers-check
ryanweiler92 May 26, 2026
f18092a
feat: Fixing header checking logic for Codex
ryanweiler92 May 26, 2026
6e73b04
feat: catch client disconnects on openai endpoints
ryanweiler92 May 26, 2026
d481335
abstract isClientDisconnect to WebUtility class and apply other endpo…
ryanweiler92 May 26, 2026
33257e4
Merge pull request #341 from SEMOSS/catch-client-disconnect-openai
ryanweiler92 May 26, 2026
c24e35e
feat: upload into the user assets folder (#342)
themaherkhalil May 28, 2026
1a31279
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen May 28, 2026
a0b2a2e
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen May 28, 2026
bac292b
Update Tomcat version from 9.0.117 to 9.0.118
radkalyan May 28, 2026
c6fac29
Merge pull request #343 from SEMOSS/tomcat-update-9.0.118
kunal0137 May 29, 2026
af278cf
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen May 29, 2026
e36707f
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen May 29, 2026
cca17e3
feat: creating chroot template on application startup (#344)
themaherkhalil Jun 1, 2026
c63fcb9
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 2, 2026
973ddde
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 2, 2026
4dc01b1
fix: ensure user context is set on access key actions
Jun 3, 2026
dfb49bd
Merge pull request #345 from SEMOSS/user-context-access-keys
agmontem-devel Jun 3, 2026
f809d6f
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 3, 2026
678e95b
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 3, 2026
1f931a8
fix: setting a new sessionid on successful first login (#346)
themaherkhalil Jun 3, 2026
7c40426
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 4, 2026
ee97024
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 4, 2026
7dedb11
fix: attempting to generate user on all endpoints (/config) for clien…
themaherkhalil Jun 4, 2026
728327a
removing encoding from anthropic endpoint
ryanweiler92 Jun 4, 2026
55228a3
remove encoding from LLM pixel in anthropic endpoints
ryanweiler92 Jun 5, 2026
18167af
Merge pull request #349 from SEMOSS/cc-fix-06-05-26
ryanweiler92 Jun 5, 2026
7c2335f
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 8, 2026
5719408
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 8, 2026
e34e4dc
feat: a2a 1.0 release
kunal0137 Jun 9, 2026
b6b8eab
fix: update to reflect DefaultImageGeneratorUtil, remove non-ascii ch…
themaherkhalil Jun 9, 2026
e80f7d3
fix: room hash to contain Room object, close executor (#351)
themaherkhalil Jun 9, 2026
4913495
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 9, 2026
8a17c53
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 9, 2026
5bbfe88
feat: initial commits for a2a forcing v1 with spec jar
kunal0137 Jun 9, 2026
cf68821
Merge branch 'dev' into cc-fix-060426
themaherkhalil Jun 9, 2026
3f6dd9b
feat: removing <encode> on openai endpoints
themaherkhalil Jun 9, 2026
b8f9bc9
Merge pull request #348 from SEMOSS/cc-fix-060426
ryanweiler92 Jun 9, 2026
899e752
chore: update log statements and remove constants.stacketrace (#352)
themaherkhalil Jun 10, 2026
9803bba
Merge branch 'dev' into feat-a2a
kunal0137 Jun 10, 2026
5520fed
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 10, 2026
b614116
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 10, 2026
e8c0c1c
feat: adding utility class to build and run the pixel LLM command, sw…
themaherkhalil Jun 11, 2026
6fd7c2f
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 11, 2026
bc0e365
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 11, 2026
42bb11c
Merge branch 'dev' into feat-a2a
kunal0137 Jun 12, 2026
2a123b9
Merge pull request #353 from SEMOSS/feat-a2a
kunal0137 Jun 12, 2026
de65abc
fix: proper ollama return in generate and chat endpoints, using utili…
themaherkhalil Jun 13, 2026
e6b8c57
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 15, 2026
f13f688
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 15, 2026
b4f1659
feat: adding groups for ms type
kunal0137 Jun 15, 2026
9493228
Merge branch 'dev' into feat-ms-groups
kunal0137 Jun 15, 2026
8fa8c9f
Merge pull request #357 from SEMOSS/feat-ms-groups
kunal0137 Jun 15, 2026
f7a7a9a
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 16, 2026
45242d1
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 16, 2026
72f38d2
Upgrading netty library version to 4.1.133 to remediate CVE-2026-42584
Jun 16, 2026
39aa870
fix: set the metadata on the original token before readonly init
agmontem-devel Jun 16, 2026
10862bd
Merge pull request #359 from SEMOSS/load-additional-metadata-from-db-…
agmontem-devel Jun 16, 2026
cb79d48
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 17, 2026
f70f997
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 17, 2026
bc12660
feat: new endpoints for github app creation and hookup with semoss pr…
themaherkhalil Jun 18, 2026
e5a1c92
chore: update web.xml for new github endpoints (#361)
themaherkhalil Jun 18, 2026
ca7b0a3
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 18, 2026
674ea84
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 18, 2026
822f16b
fix: force netty jar to specific version
kunal0137 Jun 18, 2026
cbf87a7
handle thinking blocks correctly during stream
ryanweiler92 Jun 18, 2026
511dc97
Merge branch 'dev' into anthropic-endpoint-thinking-blocks
ryanweiler92 Jun 18, 2026
b41cce3
Merge branch 'dev' into tymayer-test
kunal0137 Jun 18, 2026
3b551c9
Merge pull request #358 from SEMOSS/tymayer-test
kunal0137 Jun 18, 2026
b2ed975
Merge branch 'dev' into anthropic-endpoint-thinking-blocks
ryanweiler92 Jun 18, 2026
ce79365
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 18, 2026
f758401
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 18, 2026
ffc8e47
Merge pull request #362 from SEMOSS/anthropic-endpoint-thinking-blocks
ryanweiler92 Jun 18, 2026
ceac31d
feat: adding parameter if github app is private or public (#363)
themaherkhalil Jun 19, 2026
745d399
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 19, 2026
e6b4f24
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 19, 2026
32ad6f1
feat: using the user auth to enforce proper repo access before adding…
themaherkhalil Jun 20, 2026
5ca8799
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 21, 2026
8904a5b
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 21, 2026
2aefa1a
feat: add user name to store in audit log table (#338)
samarthKharote Jun 22, 2026
98ec45f
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 22, 2026
7135fa6
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 22, 2026
4c61fc2
feat: add subdir as part of github service (#365)
ppatel9703 Jun 24, 2026
b2c85ee
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 24, 2026
979c07c
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 24, 2026
1d93317
chore: update tomcat and jars (#366)
themaherkhalil Jun 25, 2026
3d402cc
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 26, 2026
6b0ccd0
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jun 26, 2026
46f4617
feat: adding parameter for admin check vs user check (#368)
themaherkhalil Jul 4, 2026
14f15ae
feat: consolidating the endpoints to utilize the strategy pattern wit…
themaherkhalil Jul 4, 2026
011f8c0
feat: using token filler to handle addition of groups (#370)
themaherkhalil Jul 4, 2026
ddffc94
chore: removing unused resources (#371)
themaherkhalil Jul 4, 2026
60a9af0
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 6, 2026
b7450bf
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 6, 2026
5057203
fix: removing slf4j from a2a (#372)
themaherkhalil Jul 7, 2026
edd0c31
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 8, 2026
983d25d
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 8, 2026
2cfe026
chore: adding docker compose examples (#375)
themaherkhalil Jul 10, 2026
4b5ee3a
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 10, 2026
c296312
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 10, 2026
aff608d
feat: adding endpoints to view engines user does not have access to (…
themaherkhalil Jul 12, 2026
41e8273
chore: removing deprecated and unused endpoint (#377)
themaherkhalil Jul 12, 2026
4e83df3
feat: adding limit, offset, project type, changing post to get for en…
themaherkhalil Jul 12, 2026
6af105b
Merge branch 'json-error-servlet' of https://github.com/SEMOSS/Monoli…
tevanburen Jul 13, 2026
a7520ae
Merge branch 'json-error-servlet' of https://github.com/SEMOSS/Monoli…
tevanburen Jul 13, 2026
37170f2
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 13, 2026
b6aace2
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 13, 2026
aa49ff8
feat: playwright via socket (#367)
ibrahimmahaba Jul 14, 2026
67c2f4f
fix: npe for no user session closed (#379)
themaherkhalil Jul 14, 2026
81efeba
chore: update a2a with db polling
kunal0137 Jul 14, 2026
965a72b
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 15, 2026
0d37ce2
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 15, 2026
3afca50
Merge pull request #380 from SEMOSS/chore-agent-cleanup
ryanweiler92 Jul 15, 2026
f1afafe
fix: resolving issues with responses structure, shifting all provider…
themaherkhalil Jul 15, 2026
42f5c46
Merge branch 'dev' into json-error-servlet
themaherkhalil Jul 15, 2026
4eba88f
Merge branch 'json-error-servlet' of https://github.com/SEMOSS/Monoli…
tevanburen Jul 16, 2026
88a8a06
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 16, 2026
c5bd186
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 17, 2026
0da8466
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 20, 2026
0560d7a
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 21, 2026
99550de
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Jul 22, 2026
25528e0
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 3, 2026
0d62e86
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 4, 2026
1f33dc6
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 4, 2026
6dc6743
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 6, 2026
2340f1d
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 7, 2026
07c6c22
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 12, 2026
8bbb556
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 14, 2026
4d55228
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 14, 2026
c693ce1
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 24, 2026
21d8a41
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 24, 2026
2facd69
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 25, 2026
bffe93e
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Aug 27, 2026
de7df86
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Sep 3, 2026
89edd53
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Sep 16, 2026
402e644
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Sep 23, 2026
cad9fc0
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Sep 24, 2026
2494a4c
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Sep 28, 2026
e2619a4
Merge branch 'dev' of https://github.com/SEMOSS/Monolith into json-er…
tevanburen Sep 30, 2026
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
27 changes: 24 additions & 3 deletions WebContent/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,29 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>

<error-page>
<error-code>400</error-code>
<location>/error/json</location>
</error-page>
<error-page>
<error-code>403</error-code>
<location>/error/json</location>
</error-page>
<error-page>
<error-code>404</error-code>
<location>/error/404error.html</location>
<location>/error/json</location>
</error-page>
<error-page>
<error-code>416</error-code>
<location>/error/json</location>
</error-page>
<error-page>
<error-code>500</error-code>
<location>/error/error.html</location>
<location>/error/json</location>
</error-page>
<error-page>
<exception-type>java.lang.Throwable</exception-type>
<location>/error/error.html</location>
<location>/error/json</location>
</error-page>

<!-- From Tomcat -->
Expand Down Expand Up @@ -574,6 +586,15 @@
-->

<!-- servlets -->
<!-- JSON Error Handler Servlet -->
<servlet>
<servlet-name>JsonErrorServlet</servlet-name>
<servlet-class>prerna.web.conf.JsonErrorServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>JsonErrorServlet</servlet-name>
<url-pattern>/error/json</url-pattern>
</servlet-mapping>
<!-- Servlet For SEMOSS UI - SEMOSS BE communication -->
<servlet>
<servlet-name>MainApplication</servlet-name>
Expand Down
60 changes: 60 additions & 0 deletions src/prerna/web/conf/JsonErrorServlet.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package prerna.web.conf;

import java.io.IOException;

import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.google.gson.Gson;

import java.util.LinkedHashMap;
import java.util.Map;

/**
* Servlet that handles Tomcat error pages and returns JSON responses
* instead of the default HTML error pages.
*/
public class JsonErrorServlet extends HttpServlet {

private static final long serialVersionUID = 1L;
private static final Gson GSON = new Gson();

@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
// Tomcat sets these request attributes when forwarding to error pages
Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
String message = (String) request.getAttribute("javax.servlet.error.message");
String requestUri = (String) request.getAttribute("javax.servlet.error.request_uri");

if (statusCode == null) {
statusCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
}
if (message == null || message.isEmpty()) {
message = getDefaultMessage(statusCode);
}

Map<String, Object> errorBody = new LinkedHashMap<>();
errorBody.put("status", statusCode);
errorBody.put("message", message);
if (requestUri != null) {
errorBody.put("request_uri", requestUri);
}

response.setStatus(statusCode);
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
response.getWriter().write(GSON.toJson(errorBody));
}

private static String getDefaultMessage(int statusCode) {
switch (statusCode) {
case 400: return "Bad Request";
case 403: return "Forbidden";
case 404: return "Not Found";
case 416: return "Requested Range Not Satisfiable";
case 500: return "Internal Server Error";
default: return "Error";
}
}
}
Loading