Skip to content

Commit 78e9e94

Browse files
GiBg1aNphp-coder
GiBg1aN
authored and
php-coder
committed
Sort constants in alphabetical order.
Fix #622 No functional changes.
1 parent 33dd902 commit 78e9e94

File tree

5 files changed

+47
-39
lines changed

5 files changed

+47
-39
lines changed

‎src/main/java/ru/mystamps/web/Url.java

+31-28
Original file line numberDiff line numberDiff line change
@@ -128,56 +128,59 @@ public static Map<String, String> asMap(boolean production) {
128128
boolean serveContentFromSingleHost = !production;
129129

130130
// Not all URLs are listed here but only those that are being used on views
131+
// Constants sorted in an ascending order.
131132
Map<String, String> map = new HashMap<>();
132-
map.put("PUBLIC_URL", production ? PUBLIC_URL : SITE);
133-
map.put("AUTHENTICATION_PAGE", AUTHENTICATION_PAGE);
134-
map.put("LOGIN_PAGE", LOGIN_PAGE);
135-
map.put("LOGOUT_PAGE", LOGOUT_PAGE);
136133
map.put("ACTIVATE_ACCOUNT_PAGE", ACTIVATE_ACCOUNT_PAGE);
137-
map.put("REGISTRATION_PAGE", REGISTRATION_PAGE);
134+
map.put("ADD_CATEGORY_PAGE", ADD_CATEGORY_PAGE);
135+
map.put("ADD_COUNTRY_PAGE", ADD_COUNTRY_PAGE);
136+
map.put("ADD_IMAGE_SERIES_PAGE", ADD_IMAGE_SERIES_PAGE);
138137
map.put("ADD_PARTICIPANT_PAGE", ADD_PARTICIPANT_PAGE);
139-
map.put("ADD_SERIES_PAGE", ADD_SERIES_PAGE);
140138
map.put("ADD_SERIES_ASK_PAGE", ADD_SERIES_ASK_PAGE);
141-
map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
142-
map.put("ADD_IMAGE_SERIES_PAGE", ADD_IMAGE_SERIES_PAGE);
143-
map.put("SEARCH_SERIES_BY_CATALOG", SEARCH_SERIES_BY_CATALOG);
144-
map.put("REQUEST_IMPORT_SERIES_PAGE", REQUEST_IMPORT_SERIES_PAGE);
145-
map.put("REQUEST_IMPORT_PAGE", REQUEST_IMPORT_PAGE);
146-
map.put("LIST_IMPORT_REQUESTS_PAGE", LIST_IMPORT_REQUESTS_PAGE);
147-
map.put("SUGGEST_SERIES_COUNTRY", SUGGEST_SERIES_COUNTRY);
148-
map.put("ADD_CATEGORY_PAGE", ADD_CATEGORY_PAGE);
139+
map.put("ADD_SERIES_PAGE", ADD_SERIES_PAGE);
140+
map.put("AUTHENTICATION_PAGE", AUTHENTICATION_PAGE);
141+
map.put("BOOTSTRAP_LANGUAGE", BOOTSTRAP_LANGUAGE);
142+
map.put("DAILY_STATISTICS", DAILY_STATISTICS);
149143
map.put("INFO_CATEGORY_PAGE", INFO_CATEGORY_PAGE);
150-
map.put("LIST_CATEGORIES_PAGE", LIST_CATEGORIES_PAGE);
151-
map.put("ADD_COUNTRY_PAGE", ADD_COUNTRY_PAGE);
144+
map.put("INFO_COLLECTION_PAGE", INFO_COLLECTION_PAGE);
152145
map.put("INFO_COUNTRY_PAGE", INFO_COUNTRY_PAGE);
146+
map.put("INFO_SERIES_PAGE", INFO_SERIES_PAGE);
147+
map.put("LIST_CATEGORIES_PAGE", LIST_CATEGORIES_PAGE);
153148
map.put("LIST_COUNTRIES_PAGE", LIST_COUNTRIES_PAGE);
154-
map.put("INFO_COLLECTION_PAGE", INFO_COLLECTION_PAGE);
149+
map.put("LIST_IMPORT_REQUESTS_PAGE", LIST_IMPORT_REQUESTS_PAGE);
150+
map.put("LOGIN_PAGE", LOGIN_PAGE);
151+
map.put("LOGOUT_PAGE", LOGOUT_PAGE);
152+
map.put("PUBLIC_URL", production ? PUBLIC_URL : SITE);
153+
map.put("REGISTRATION_PAGE", REGISTRATION_PAGE);
154+
map.put("REQUEST_IMPORT_PAGE", REQUEST_IMPORT_PAGE);
155+
map.put("REQUEST_IMPORT_SERIES_PAGE", REQUEST_IMPORT_SERIES_PAGE);
156+
map.put("SEARCH_SERIES_BY_CATALOG", SEARCH_SERIES_BY_CATALOG);
155157
map.put("SITE_EVENTS_PAGE", SITE_EVENTS_PAGE);
156-
map.put("BOOTSTRAP_LANGUAGE", BOOTSTRAP_LANGUAGE);
157-
map.put("DAILY_STATISTICS", DAILY_STATISTICS);
158+
map.put("SUGGEST_SERIES_COUNTRY", SUGGEST_SERIES_COUNTRY);
158159

159160
if (serveContentFromSingleHost) {
161+
// Constants sorted in an ascending order.
160162
map.put("BOOTSTRAP_CSS", BOOTSTRAP_CSS);
161163
map.put("BOOTSTRAP_JS", BOOTSTRAP_JS);
162-
map.put("JQUERY_JS", JQUERY_JS);
163-
map.put("SELECTIZE_CSS", SELECTIZE_CSS);
164-
map.put("SELECTIZE_JS", SELECTIZE_JS);
164+
map.put("CATALOG_UTILS_JS", CATALOG_UTILS_JS);
165+
map.put("COLLECTION_INFO_JS", COLLECTION_INFO_JS);
166+
map.put("FAVICON_ICO", FAVICON_ICO);
165167
map.put("GET_IMAGE_PAGE", GET_IMAGE_PAGE);
166168
map.put("GET_IMAGE_PREVIEW_PAGE", GET_IMAGE_PREVIEW_PAGE);
167-
map.put("FAVICON_ICO", FAVICON_ICO);
169+
map.put("JQUERY_JS", JQUERY_JS);
168170
map.put("MAIN_CSS", MAIN_CSS);
169-
map.put("CATALOG_UTILS_JS", CATALOG_UTILS_JS);
171+
map.put("SELECTIZE_CSS", SELECTIZE_CSS);
172+
map.put("SELECTIZE_JS", SELECTIZE_JS);
170173
map.put("SERIES_ADD_JS", SERIES_ADD_JS);
171-
map.put("COLLECTION_INFO_JS", COLLECTION_INFO_JS);
172174
} else {
173175
// Use a separate domain for our own resources
176+
// Constants sorted in an ascending order.
177+
map.put("FAVICON_ICO", STATIC_RESOURCES_URL + FAVICON_ICO);
178+
map.put("CATALOG_UTILS_JS", STATIC_RESOURCES_URL + CATALOG_UTILS_JS);
179+
map.put("COLLECTION_INFO_JS", STATIC_RESOURCES_URL + COLLECTION_INFO_JS);
174180
map.put("GET_IMAGE_PAGE", STATIC_RESOURCES_URL + GET_IMAGE_PAGE);
175181
map.put("GET_IMAGE_PREVIEW_PAGE", STATIC_RESOURCES_URL + GET_IMAGE_PREVIEW_PAGE);
176-
map.put("FAVICON_ICO", STATIC_RESOURCES_URL + FAVICON_ICO);
177182
map.put("MAIN_CSS", STATIC_RESOURCES_URL + MAIN_CSS);
178-
map.put("CATALOG_UTILS_JS", STATIC_RESOURCES_URL + CATALOG_UTILS_JS);
179183
map.put("SERIES_ADD_JS", STATIC_RESOURCES_URL + SERIES_ADD_JS);
180-
map.put("COLLECTION_INFO_JS", STATIC_RESOURCES_URL + COLLECTION_INFO_JS);
181184

182185
// Use CDN for the external resources like libraries
183186
map.put("BOOTSTRAP_CSS", BOOTSTRAP_CSS_CDN);

‎src/main/java/ru/mystamps/web/support/spring/security/Authority.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,21 @@
2222

2323
@SuppressWarnings("checkstyle:linelength")
2424
public final class Authority {
25+
// Constants sorted in an ascending order.
2526
public static final GrantedAuthority ADD_COMMENTS_TO_SERIES = new SimpleGrantedAuthority(StringAuthority.ADD_COMMENTS_TO_SERIES);
2627
public static final GrantedAuthority ADD_IMAGES_TO_SERIES = new SimpleGrantedAuthority(StringAuthority.ADD_IMAGES_TO_SERIES);
2728
public static final GrantedAuthority ADD_PARTICIPANT = new SimpleGrantedAuthority(StringAuthority.ADD_PARTICIPANT);
2829
public static final GrantedAuthority ADD_SERIES_SALES = new SimpleGrantedAuthority(StringAuthority.ADD_SERIES_SALES);
29-
public static final GrantedAuthority MANAGE_TOGGLZ = new SimpleGrantedAuthority(StringAuthority.MANAGE_TOGGLZ);
3030
public static final GrantedAuthority CREATE_CATEGORY = new SimpleGrantedAuthority(StringAuthority.CREATE_CATEGORY);
3131
public static final GrantedAuthority CREATE_COUNTRY = new SimpleGrantedAuthority(StringAuthority.CREATE_COUNTRY);
3232
public static final GrantedAuthority CREATE_SERIES = new SimpleGrantedAuthority(StringAuthority.CREATE_SERIES);
3333
public static final GrantedAuthority DOWNLOAD_IMAGE = new SimpleGrantedAuthority(StringAuthority.DOWNLOAD_IMAGE);
3434
public static final GrantedAuthority IMPORT_SERIES = new SimpleGrantedAuthority(StringAuthority.IMPORT_SERIES);
35+
public static final GrantedAuthority MANAGE_TOGGLZ = new SimpleGrantedAuthority(StringAuthority.MANAGE_TOGGLZ);
3536
public static final GrantedAuthority UPDATE_COLLECTION = new SimpleGrantedAuthority(StringAuthority.UPDATE_COLLECTION);
36-
public static final GrantedAuthority VIEW_SITE_EVENTS = new SimpleGrantedAuthority(StringAuthority.VIEW_SITE_EVENTS);
37-
public static final GrantedAuthority VIEW_SERIES_SALES = new SimpleGrantedAuthority(StringAuthority.VIEW_SERIES_SALES);
3837
public static final GrantedAuthority VIEW_DAILY_STATS = new SimpleGrantedAuthority(StringAuthority.VIEW_DAILY_STATS);
38+
public static final GrantedAuthority VIEW_SERIES_SALES = new SimpleGrantedAuthority(StringAuthority.VIEW_SERIES_SALES);
39+
public static final GrantedAuthority VIEW_SITE_EVENTS = new SimpleGrantedAuthority(StringAuthority.VIEW_SITE_EVENTS);
3940

4041
private Authority() {
4142
}

‎src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,25 @@ public org.springframework.security.core.userdetails.UserDetails loadUserByUsern
6767
}
6868

6969
private static Collection<? extends GrantedAuthority> getAuthorities(UserDetails userDetails) {
70+
// Constants sorted in an ascending order.
7071
List<GrantedAuthority> authorities = new LinkedList<>();
7172
authorities.add(Authority.CREATE_CATEGORY);
7273
authorities.add(Authority.CREATE_COUNTRY);
7374
authorities.add(Authority.CREATE_SERIES);
7475
authorities.add(Authority.UPDATE_COLLECTION);
7576

7677
if (userDetails.isAdmin()) {
78+
// Constants sorted in an ascending order.
7779
authorities.add(Authority.ADD_COMMENTS_TO_SERIES);
7880
authorities.add(Authority.ADD_IMAGES_TO_SERIES);
79-
authorities.add(Authority.VIEW_SITE_EVENTS);
8081
authorities.add(Authority.ADD_PARTICIPANT);
8182
authorities.add(Authority.ADD_SERIES_SALES);
8283
authorities.add(Authority.DOWNLOAD_IMAGE);
83-
authorities.add(Authority.VIEW_SERIES_SALES);
8484
authorities.add(Authority.IMPORT_SERIES);
8585
authorities.add(Authority.MANAGE_TOGGLZ);
8686
authorities.add(Authority.VIEW_DAILY_STATS);
87+
authorities.add(Authority.VIEW_SERIES_SALES);
88+
authorities.add(Authority.VIEW_SITE_EVENTS);
8789
}
8890

8991
return authorities;

‎src/main/java/ru/mystamps/web/support/spring/security/HasAuthority.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@
1919

2020
@SuppressWarnings({ "checkstyle:linelength", "PMD.AvoidDuplicateLiterals" })
2121
public final class HasAuthority {
22+
// Constants sorted in an ascending order.
2223
public static final String ADD_PARTICIPANT = "hasAuthority('" + StringAuthority.ADD_PARTICIPANT + "')";
2324
public static final String ADD_SERIES_SALES = "hasAuthority('" + StringAuthority.ADD_SERIES_SALES + "')";
24-
public static final String CREATE_SERIES = "hasAuthority('" + StringAuthority.CREATE_SERIES + "')";
2525
public static final String CREATE_CATEGORY = "hasAuthority('" + StringAuthority.CREATE_CATEGORY + "')";
2626
public static final String CREATE_COUNTRY = "hasAuthority('" + StringAuthority.CREATE_COUNTRY + "')";
27+
public static final String CREATE_SERIES = "hasAuthority('" + StringAuthority.CREATE_SERIES + "')";
2728
public static final String DOWNLOAD_IMAGE = "hasAuthority('" + StringAuthority.DOWNLOAD_IMAGE + "')";
2829
public static final String IMPORT_SERIES = "hasAuthority('" + StringAuthority.IMPORT_SERIES + "')";
29-
public static final String VIEW_DAILY_STATS = "hasAuthority('" + StringAuthority.VIEW_DAILY_STATS + "')";
3030
public static final String UPDATE_COLLECTION = "hasAuthority('" + StringAuthority.UPDATE_COLLECTION + "')";
31-
public static final String VIEW_SITE_EVENTS = "hasAuthority('" + StringAuthority.VIEW_SITE_EVENTS + "')";
31+
public static final String VIEW_DAILY_STATS = "hasAuthority('" + StringAuthority.VIEW_DAILY_STATS + "')";
3232
public static final String VIEW_SERIES_SALES = "hasAuthority('" + StringAuthority.VIEW_SERIES_SALES + "')";
33+
public static final String VIEW_SITE_EVENTS = "hasAuthority('" + StringAuthority.VIEW_SITE_EVENTS + "')";
3334

3435
private HasAuthority() {
3536
}

‎src/main/java/ru/mystamps/web/support/spring/security/StringAuthority.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@
1818
package ru.mystamps.web.support.spring.security;
1919

2020
public final class StringAuthority {
21+
// Constants sorted in an ascending order.
2122
public static final String ADD_COMMENTS_TO_SERIES = "ADD_COMMENTS_TO_SERIES";
2223
public static final String ADD_IMAGES_TO_SERIES = "ADD_IMAGES_TO_SERIES";
2324
public static final String ADD_PARTICIPANT = "ADD_PARTICIPANT";
2425
public static final String ADD_SERIES_SALES = "ADD_SERIES_SALES";
25-
public static final String MANAGE_TOGGLZ = "MANAGE_TOGGLZ";
2626
public static final String CREATE_CATEGORY = "CREATE_CATEGORY";
2727
public static final String CREATE_COUNTRY = "CREATE_COUNTRY";
2828
public static final String CREATE_SERIES = "CREATE_SERIES";
2929
public static final String DOWNLOAD_IMAGE = "DOWNLOAD_IMAGE";
3030
public static final String IMPORT_SERIES = "IMPORT_SERIES";
31+
public static final String MANAGE_TOGGLZ = "MANAGE_TOGGLZ";
3132
public static final String UPDATE_COLLECTION = "UPDATE_COLLECTION";
32-
public static final String VIEW_SITE_EVENTS = "VIEW_SITE_EVENTS";
33-
public static final String VIEW_SERIES_SALES = "VIEW_SERIES_SALES";
3433
public static final String VIEW_DAILY_STATS = "VIEW_DAILY_STATS";
34+
public static final String VIEW_SERIES_SALES = "VIEW_SERIES_SALES";
35+
public static final String VIEW_SITE_EVENTS = "VIEW_SITE_EVENTS";
3536

3637
private StringAuthority() {
3738
}

0 commit comments

Comments
 (0)