Skip to content

Commit c44ad65

Browse files
ofahimIQSSofahimIQSS
authored
Merge pull request #10075 from bencomp/10074-modifiers
Put modifiers in the correct order
2 parents 45bdf5a + a32b9ed commit c44ad65

File tree

9 files changed

+179
-180
lines changed

9 files changed

+179
-180
lines changed

‎src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java

Lines changed: 156 additions & 157 deletions
Large diffs are not rendered by default.

‎src/main/java/edu/harvard/iq/dataverse/WidgetWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
@Named
1919
public class WidgetWrapper implements java.io.Serializable {
2020

21-
private final static String WIDGET_PARAMETER = "widget";
22-
private final static char WIDGET_SEPARATOR = '@';
21+
private static final String WIDGET_PARAMETER = "widget";
22+
private static final char WIDGET_SEPARATOR = '@';
2323

2424
private Boolean widgetView;
2525
private String widgetHome;

‎src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
public abstract class AbstractOAuth2AuthenticationProvider implements AuthenticationProvider {
3232

33-
final static Logger logger = Logger.getLogger(AbstractOAuth2AuthenticationProvider.class.getName());
33+
static final Logger logger = Logger.getLogger(AbstractOAuth2AuthenticationProvider.class.getName());
3434

3535
protected static class ParsedUserResponse {
3636
public final AuthenticatedUserDisplayInfo displayInfo;

‎src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
*/
5050
public class OrcidOAuth2AP extends AbstractOAuth2AuthenticationProvider {
5151

52-
final static Logger logger = Logger.getLogger(OrcidOAuth2AP.class.getName());
52+
static final Logger logger = Logger.getLogger(OrcidOAuth2AP.class.getName());
5353

5454
public static final String PROVIDER_ID_PRODUCTION = "orcid";
5555
public static final String PROVIDER_ID_SANDBOX = "orcid-sandbox";

‎src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class DataverseRequest {
2626
private final String invocationId;
2727
private final HttpServletRequest httpServletRequest;
2828

29-
private final static String undefined = "0.0.0.0";
29+
private static final String undefined = "0.0.0.0";
3030

31-
private final static String MDKEY_PREFIX="mdkey.";
31+
private static final String MDKEY_PREFIX="mdkey.";
3232

3333
private static final Logger logger = Logger.getLogger(DataverseRequest.class.getName());
3434

‎src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ public class ShapefileHandler{
6868
private static final Logger logger = Logger.getLogger(ShapefileHandler.class.getCanonicalName());
6969

7070
// Reference for these extensions: http://en.wikipedia.org/wiki/Shapefile
71-
public final static String SHAPEFILE_FILE_TYPE = "application/zipped-shapefile";
72-
public final static String SHAPEFILE_FILE_TYPE_FRIENDLY_NAME = "Shapefile as ZIP Archive";
73-
public final static List<String> SHAPEFILE_MANDATORY_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj");
74-
public final static String SHP_XML_EXTENSION = "shp.xml";
75-
public final static String BLANK_EXTENSION = "__PLACEHOLDER-FOR-BLANK-EXTENSION__";
76-
public final static List<String> SHAPEFILE_ALL_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj", "sbn", "sbx", "fbn", "fbx", "ain", "aih", "ixs", "mxs", "atx", "cpg", "qpj", "qmd", SHP_XML_EXTENSION);
71+
public static final String SHAPEFILE_FILE_TYPE = "application/zipped-shapefile";
72+
public static final String SHAPEFILE_FILE_TYPE_FRIENDLY_NAME = "Shapefile as ZIP Archive";
73+
public static final List<String> SHAPEFILE_MANDATORY_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj");
74+
public static final String SHP_XML_EXTENSION = "shp.xml";
75+
public static final String BLANK_EXTENSION = "__PLACEHOLDER-FOR-BLANK-EXTENSION__";
76+
public static final List<String> SHAPEFILE_ALL_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj", "sbn", "sbx", "fbn", "fbx", "ain", "aih", "ixs", "mxs", "atx", "cpg", "qpj", "qmd", SHP_XML_EXTENSION);
7777

7878
public boolean DEBUG = false;
7979

‎src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public class SystemConfig {
8787
private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_IMAGE = 3000000L; // 3 MB
8888
private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_PDF = 1000000L; // 1 MB
8989

90-
public final static String DEFAULTCURATIONLABELSET = "DEFAULT";
91-
public final static String CURATIONLABELSDISABLED = "DISABLED";
90+
public static final String DEFAULTCURATIONLABELSET = "DEFAULT";
91+
public static final String CURATIONLABELSDISABLED = "DISABLED";
9292

9393
public String getVersion() {
9494
return getVersion(false);
@@ -473,7 +473,7 @@ public Integer getSearchHighlightFragmentSize() {
473473
String fragSize = settingsService.getValueForKey(SettingsServiceBean.Key.SearchHighlightFragmentSize);
474474
if (fragSize != null) {
475475
try {
476-
return new Integer(fragSize);
476+
return Integer.valueOf(fragSize);
477477
} catch (NumberFormatException nfe) {
478478
logger.info("Could not convert " + SettingsServiceBean.Key.SearchHighlightFragmentSize + " to int: " + nfe);
479479
}
@@ -490,7 +490,7 @@ public long getTabularIngestSizeLimit() {
490490

491491
if (limitEntry != null) {
492492
try {
493-
Long sizeOption = new Long(limitEntry);
493+
Long sizeOption = Long.valueOf(limitEntry);
494494
return sizeOption;
495495
} catch (NumberFormatException nfe) {
496496
logger.warning("Invalid value for TabularIngestSizeLimit option? - " + limitEntry);
@@ -515,7 +515,7 @@ public long getTabularIngestSizeLimit(String formatName) {
515515

516516
if (limitEntry != null) {
517517
try {
518-
Long sizeOption = new Long(limitEntry);
518+
Long sizeOption = Long.valueOf(limitEntry);
519519
return sizeOption;
520520
} catch (NumberFormatException nfe) {
521521
logger.warning("Invalid value for TabularIngestSizeLimit:" + formatName + "? - " + limitEntry );
@@ -1061,7 +1061,7 @@ public long getDatasetValidationSizeLimit() {
10611061

10621062
if (limitEntry != null) {
10631063
try {
1064-
Long sizeOption = new Long(limitEntry);
1064+
Long sizeOption = Long.valueOf(limitEntry);
10651065
return sizeOption;
10661066
} catch (NumberFormatException nfe) {
10671067
logger.warning("Invalid value for DatasetValidationSizeLimit option? - " + limitEntry);
@@ -1076,7 +1076,7 @@ public long getFileValidationSizeLimit() {
10761076

10771077
if (limitEntry != null) {
10781078
try {
1079-
Long sizeOption = new Long(limitEntry);
1079+
Long sizeOption = Long.valueOf(limitEntry);
10801080
return sizeOption;
10811081
} catch (NumberFormatException nfe) {
10821082
logger.warning("Invalid value for FileValidationSizeLimit option? - " + limitEntry);

‎src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorServiceBean.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.util.Date;
1414
import java.util.LinkedHashMap;
1515
import java.util.List;
16+
import java.util.Map;
1617
import java.util.Properties;
1718
import java.util.logging.Level;
1819
import java.util.logging.Logger;
@@ -83,8 +84,7 @@ private enum ValidatorTypes {
8384
GoodStrengthValidator, StandardValidator
8485
}
8586

86-
@SuppressWarnings("unchecked")
87-
private final static LinkedHashMap<ValidatorTypes, PasswordValidator> validators = new LinkedHashMap(2);
87+
private static final Map<ValidatorTypes, PasswordValidator> validators = new LinkedHashMap<>(2);
8888
private int goodStrength;
8989
private int maxLength;
9090
private int minLength;
@@ -100,7 +100,7 @@ private enum ValidatorTypes {
100100
public PasswordValidatorServiceBean() {
101101
final Properties properties = PropertiesMessageResolver.getDefaultProperties();
102102
properties.setProperty(GoodStrengthRule.ERROR_CODE_GOODSTRENGTH, GoodStrengthRule.ERROR_MESSAGE_GOODSTRENGTH);
103-
messageResolver = new PropertiesMessageResolver(properties);
103+
messageResolver = new PropertiesMessageResolver(properties);
104104
}
105105

106106
public PasswordValidatorServiceBean(List<CharacterRule> characterRules) {

‎src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class AuthenticationProviderTest {
1717

18-
private final static String[] authProviders = {"null", "builtin", "github", "google", "orcid", "orcid-sandbox", "shib"};
18+
private static final String[] authProviders = {"null", "builtin", "github", "google", "orcid", "orcid-sandbox", "shib"};
1919
private static Map<String, String> bundleTestMap;
2020

2121
@BeforeAll

0 commit comments

Comments
 (0)