Skip to content

Commit 9260045

Browse files
robotdanrobotdan
committed
Cleanup
1 parent e49d4d7 commit 9260045

File tree

5 files changed

+27
-25
lines changed

5 files changed

+27
-25
lines changed

‎prime-mvc.ipr‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@
545545
<fileSet type="namedScope" name="control-templates" pattern="file[prime-mvc]:src/main/ftl/WEB-INF/control-templates/*" />
546546
</list>
547547
</option>
548-
<DB2CodeStyleSettings version="6">
548+
<DB2CodeStyleSettings version="7">
549549
<option name="KEYWORD_CASE" value="2" />
550550
<option name="TYPE_CASE" value="2" />
551551
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -585,7 +585,7 @@
585585
<option name="EXPR_CASE_THEN_WRAP" value="true" />
586586
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
587587
</DB2CodeStyleSettings>
588-
<DerbyCodeStyleSettings version="6">
588+
<DerbyCodeStyleSettings version="7">
589589
<option name="KEYWORD_CASE" value="2" />
590590
<option name="TYPE_CASE" value="2" />
591591
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -629,7 +629,7 @@
629629
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
630630
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
631631
</GroovyCodeStyleSettings>
632-
<H2CodeStyleSettings version="6">
632+
<H2CodeStyleSettings version="7">
633633
<option name="KEYWORD_CASE" value="2" />
634634
<option name="TYPE_CASE" value="2" />
635635
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -669,7 +669,7 @@
669669
<option name="EXPR_CASE_THEN_WRAP" value="true" />
670670
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
671671
</H2CodeStyleSettings>
672-
<HSQLCodeStyleSettings version="6">
672+
<HSQLCodeStyleSettings version="7">
673673
<option name="KEYWORD_CASE" value="2" />
674674
<option name="TYPE_CASE" value="2" />
675675
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -733,7 +733,7 @@
733733
<option name="JD_PRESERVE_LINE_FEEDS" value="true" />
734734
<option name="JD_INDENT_ON_CONTINUATION" value="true" />
735735
</JavaCodeStyleSettings>
736-
<MSSQLCodeStyleSettings version="6">
736+
<MSSQLCodeStyleSettings version="7">
737737
<option name="KEYWORD_CASE" value="2" />
738738
<option name="TYPE_CASE" value="2" />
739739
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -776,7 +776,7 @@
776776
<MarkdownNavigatorCodeStyleSettings>
777777
<option name="WRAP_ON_TYPING" value="0" />
778778
</MarkdownNavigatorCodeStyleSettings>
779-
<MySQLCodeStyleSettings version="6">
779+
<MySQLCodeStyleSettings version="7">
780780
<option name="KEYWORD_CASE" value="2" />
781781
<option name="TYPE_CASE" value="2" />
782782
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -816,7 +816,7 @@
816816
<option name="EXPR_CASE_THEN_WRAP" value="true" />
817817
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
818818
</MySQLCodeStyleSettings>
819-
<OracleCodeStyleSettings version="6">
819+
<OracleCodeStyleSettings version="7">
820820
<option name="KEYWORD_CASE" value="2" />
821821
<option name="TYPE_CASE" value="2" />
822822
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -862,7 +862,7 @@
862862
<option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
863863
<option name="PHPDOC_WRAP_LONG_LINES" value="true" />
864864
</PHPCodeStyleSettings>
865-
<PostgresCodeStyleSettings version="6">
865+
<PostgresCodeStyleSettings version="7">
866866
<option name="KEYWORD_CASE" value="2" />
867867
<option name="TYPE_CASE" value="2" />
868868
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -905,7 +905,7 @@
905905
<Properties>
906906
<option name="KEEP_BLANK_LINES" value="true" />
907907
</Properties>
908-
<SQLiteCodeStyleSettings version="6">
908+
<SQLiteCodeStyleSettings version="7">
909909
<option name="KEYWORD_CASE" value="2" />
910910
<option name="TYPE_CASE" value="2" />
911911
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -948,7 +948,7 @@
948948
<ScalaCodeStyleSettings>
949949
<option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
950950
</ScalaCodeStyleSettings>
951-
<SqlCodeStyleSettings version="6">
951+
<SqlCodeStyleSettings version="7">
952952
<option name="KEYWORD_CASE" value="2" />
953953
<option name="TYPE_CASE" value="2" />
954954
<option name="CUSTOM_TYPE_CASE" value="2" />
@@ -1013,7 +1013,7 @@
10131013
<option name="WRAP_PARENTHESIZED_EXPRESSION_INSIDE_VALUES" value="0" />
10141014
<option name="NEW_LINE_AFTER_SELECT_ITEM" value="false" />
10151015
</SqlCodeStyleSettings>
1016-
<SybaseCodeStyleSettings version="6">
1016+
<SybaseCodeStyleSettings version="7">
10171017
<option name="KEYWORD_CASE" value="2" />
10181018
<option name="TYPE_CASE" value="2" />
10191019
<option name="CUSTOM_TYPE_CASE" value="2" />

‎src/main/java/org/primeframework/mvc/config/AbstractMVCConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public abstract class AbstractMVCConfiguration implements MVCConfiguration {
4040

4141
public static final long MAX_SIZE = 1024000;
4242

43-
public boolean allowAlternateFormAction;
43+
public boolean allowAlternateFormAction = true;
4444

4545
public boolean autoHTMLEscapingEnabled = true;
4646

‎src/test/java/org/primeframework/mvc/GlobalTest.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,15 +1179,6 @@ public void get_unknownParameters() throws Exception {
11791179

11801180
@Test
11811181
public void get_url_rewrite() {
1182-
// Disabled by default
1183-
simulator.test("/doesNotExist?__a_foo=/user/edit&foo=true")
1184-
.get()
1185-
.assertStatusCode(404)
1186-
.assertContainsNoFieldMessages()
1187-
.assertBodyContains("The page is missing!");
1188-
assertFalse(EditAction.getCalled);
1189-
1190-
configuration.allowAlternateFormAction = true;
11911182
simulator.test("/doesNotExist?__a_foo=/user/edit&foo=true")
11921183
.get()
11931184
.assertStatusCode(200)
@@ -1196,6 +1187,18 @@ public void get_url_rewrite() {
11961187
<head><title>Edit a user</title></head>
11971188
""");
11981189
assertTrue(EditAction.getCalled);
1190+
1191+
// Disabled
1192+
configuration.allowAlternateFormAction = false;
1193+
// Reset
1194+
EditAction.getCalled = false;
1195+
1196+
simulator.test("/doesNotExist?__a_foo=/user/edit&foo=true")
1197+
.get()
1198+
.assertStatusCode(404)
1199+
.assertContainsNoFieldMessages()
1200+
.assertBodyContains("The page is missing!");
1201+
assertFalse(EditAction.getCalled);
11991202
}
12001203

12011204
@Test

‎src/test/java/org/primeframework/mvc/PrimeBaseTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public void beforeMethod() {
203203
configuration.allowUnknownParameters = false;
204204

205205
// Reset allow alternate form action
206-
configuration.allowAlternateFormAction = false;
206+
configuration.allowAlternateFormAction = true;
207207

208208
// Reset the call count on the invocation finalizer
209209
MockMVCWorkflowFinalizer.Called.set(0);

‎src/test/java/org/primeframework/mvc/action/DefaultActionMappingWorkflowTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
public class DefaultActionMappingWorkflowTest extends PrimeBaseTest {
4444
@Test
4545
public void differentButtonClick() throws Exception {
46-
// enable alternate form actions
47-
configuration.allowAlternateFormAction = true;
48-
4946
request.setPath("/admin/user/edit");
5047
request.setMethod(HTTPMethod.POST);
5148
request.addURLParameter("__a_submit", "");
@@ -58,6 +55,8 @@ public void differentButtonClick() throws Exception {
5855
@Test
5956
public void differentButtonClick_notAllowed() throws Exception {
6057
// Default behavior will be to limit using alternate form actions
58+
configuration.allowAlternateFormAction = false;
59+
6160
request.setPath("/admin/user/edit");
6261
request.setMethod(HTTPMethod.POST);
6362
request.addURLParameter("__a_submit", "");

0 commit comments

Comments
 (0)