Commit Graph

81 Commits

Author SHA1 Message Date
Lukasz Lenart 175c852eef WW-4684 Uses charset and adds some logging 2016-09-05 12:14:12 +02:00
Lukasz Lenart 547718fcc6 WW-4684 Uses Content-Type to perform action based on defined type 2016-09-05 12:02:00 +02:00
victorsosa 6e07a63797 WW-4650 Json deserialization does not work in 2.5.1
logic need to be changed as accept can be a list; the check need to be
done in the list itself.

Accept:application/json, text/plain, */*
2016-06-24 09:06:52 -04:00
Lukasz Lenart e60119436a WW-4632 Uses proper DTD version 2016-06-12 13:10:49 +02:00
Lukasz Lenart 880c1d54a4 WW-4558 contentType override ignored for JSONInterceptor 2016-05-22 08:30:27 +02:00
Lukasz Lenart 104bd92b88 WW-4627 Adds unit test to confirm the issue 2016-05-13 08:07:59 +02:00
victorsosa d16aa65098 remove old second contentType parameter 2016-05-06 18:04:04 -04:00
victorsosa 8b8135af79 Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558
# Conflicts:
#	plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
2016-02-15 10:37:26 -04:00
victorsosa bab451c6d8 Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558
# Conflicts:
#	plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
2016-02-15 10:34:15 -04:00
victorsosa 0d49050381 fix patch WW-4558
contentType override ignored for JSONInterceptor

use of accept parameter st by the interceptor params


Signed-off-by: victorsosa <victor.sosa@peopleware.do>
2016-02-15 10:31:36 -04:00
victorsosa fab687a07e fix patch WW-4558
contentType override ignored for JSONInterceptor

From now on:

The "accept" request header parameter must be "application/json" or
"application/json-rpc"

Also the default encoding is "UTF-8"
2016-02-15 08:28:01 -04:00
cnenning b0a66b47ac increased visibilty of methods and constants for better extensibility 2016-01-14 09:33:50 +01:00
cnenning 7bd8dd9559 made methods non static and private, javadoc updates 2016-01-12 14:14:09 +01:00
cnenning cb11898416 Adds new result 'JSONActionRedirectResult' to json-plugin. Contains tests and example in showcase app. The new result type is intended to be used along with existing JSONValidationInterceptor. It makes it possible to do form validation via ajax and handle form submitting, action execution and redirect evaluation all in one request inside JS context. 2016-01-11 14:36:32 +01:00
Victor Sosa 32597350fe Update unit test 2016-01-04 12:55:16 -04:00
Victor Sosa b198e3bf3d Patch WW-3945
Set default encoding for JSONResult to UTF-8

Now the default encoding is UTF-8 for JSON as should be.
2016-01-04 12:20:58 -04:00
Victor Sosa f9b7ebb87e Patch WW-3945
Set default encoding for JSONResult to UTF-8

Now the default encoding is UTF-8 for JSON as should be.
2016-01-04 12:14:39 -04:00
Victor Sosa db483ccd15 fix for WW-4269
blank double results in NumberFormatException being thrown on sending
JSON in request body
2015-12-30 13:36:58 -04:00
Johannes Geppert 775c82a743 WW-4531- Improve javadoc to be compatible with more strict JDK8 javadoc standard 2015-07-24 20:27:31 +02:00
Johannes Geppert eb564a25e1 Fix wrong closing HTML tags in javadoc comments 2015-07-16 22:02:21 +02:00
Lukasz Lenart 46b0ef632f WW-4516 Allows disable BeanInfo cache in devMode 2015-06-26 21:45:30 +02:00
Lukasz Lenart fd0db86560 WW-4518 Moves the new filters to proper package 2015-06-23 17:36:32 +02:00
Lukasz Lenart 8de090fda2 WW-4518 Drops FilterDispatcher 2015-06-23 16:09:34 +02:00
Naros f18e24d2ac Renamed setter for devMode. 2015-06-22 10:32:05 -05:00
Naros 88bfeb556d Removed unused methods
Removed JSONUtil.serialize(Object) in favor for using the method that
accepts a boolean to control bean caching functionality.
2015-06-22 09:21:13 -05:00
Naros a778ba1a3d Renamed debugMode to devMode.
Renamed the debugMode variable to devMode.
2015-06-22 09:18:24 -05:00
Naros 30df43f1fa WW-4516: Allow JSON plug-in to skip bean cache when devMode is enabled. 2015-06-20 13:19:29 -05:00
Lukasz Lenart e2347f165c WW-4077 Moves ValidationAware interface into proper package 2015-06-18 11:33:49 +02:00
Johannes Geppert 5d86c0e5c9 Minor code improvement's in the struts json plugin
- Use Java 7 features like diamond operator
- Improve some logging message
- Use BooleanUtils.toBoolean(string) instead of "true".isEquals to be more robust
2015-06-08 20:17:45 +02:00
Johannes Geppert 27bfb22df7 WW-4510 Upgrade spring plugin dependencies to spring version 4.x
- Struts Mocks in JSON and JFreechart plugin needs to be implement the new Spring4 mocks api
2015-06-08 19:09:09 +02:00
Johannes Geppert 8e8771153a WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
- Use log4j2 placeholder for logging messages and optimize logging a bit
2015-05-25 21:25:50 +02:00
Johannes Geppert 95805e54f7 WW-4504 - Mark current logging layer as @deprecated and use Log4j2 as default one
- Use log4j2 Logger and LogManager instead of xwork implementation everywhere
2015-05-25 12:42:23 +02:00
aronshen b888275803 change findBaseAccessor method
in hibernate4.3.7,because javassist3.18.1's class name generate rule is '_$$_jvst'+...
2015-01-20 11:54:10 +08:00
Lukasz Lenart da4a22078a WW-4413 Improves JSON interceptor to handle JSON arrays 2014-12-29 11:29:08 +01:00
Lukasz Lenart 5f2898eadf Cleans up Maven generated website 2014-12-02 12:41:06 +01:00
Aleksandr Mashchenko 61cffe68fe improved interceptor that accepts and maps JSON array 2014-10-13 20:07:07 +03:00
Lukasz Lenart 120830f1ac WW-4301 Adds additional use-case to proof the problem exists 2014-08-07 08:43:42 +02:00
Lukasz Lenart a2d4bdd8cf WW-4185 makes default json date format configurable
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1556522 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 13:02:59 +00:00
Lukasz Lenart e73cc3fb09 WW-4271 Improves pattern logging in JSONUtil
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1556509 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 12:03:18 +00:00
Lukasz Lenart 3c3168bff4 WW-4041 Uses the latest Commons Lang3 3.2 version and escapeJson method to solve problem with escaping single quote
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1554923 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 21:27:30 +00:00
Christian Grobmeier 5e3e793576 removed unused site folder and site.xml
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1521449 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 12:08:04 +00:00
Lukasz Lenart 9f9f8eb045 Modifies expected results slightly
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519925 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 07:36:00 +00:00
Lukasz Lenart 48a8dc5371 Modifies assertEquals on result to don't depend on order of validations
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519918 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 06:51:05 +00:00
Lukasz Lenart 6cfc28b359 WW-3964 Defines DEFAULT_PARAM static field to reduce noise in the logs
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1507951 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 06:40:10 +00:00
Lukasz Lenart eb41dc6ea6 Removes unneeded validation annotation
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1499265 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 08:44:46 +00:00
Lukasz Lenart eb2a9eb8ff WW-3593 Adds missing html files
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1486344 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 16:37:42 +00:00
Maurizio Cucchiara 791665dd2a Fixed broken tests
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1466402 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 09:33:04 +00:00
Maurizio Cucchiara 1d64a3e75d Used the commons library api where possible
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1466100 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 16:19:50 +00:00
Lukasz Lenart 32ea57d925 Solves problem with possible NPE when key is null - https://github.com/apache/struts2/pull/4
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1436290 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 11:37:16 +00:00
Lukasz Lenart a4f1a77b2d WW-3863 Allows to define encoding per result
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1421740 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 08:53:49 +00:00