Merge pull request #10075 from bencomp/10074-modifiers

Put modifiers in the correct order
IQSS · Oct 10, 2024 · c44ad65 · c44ad65
2 parents 45bdf5a + a32b9ed
commit c44ad65
Show file tree

Hide file tree

Showing 9 changed files with 179 additions and 180 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldConstant.java
diff --git a/src/main/java/edu/harvard/iq/dataverse/WidgetWrapper.java b/src/main/java/edu/harvard/iq/dataverse/WidgetWrapper.java
@@ -18,8 +18,8 @@
 @Named
 public class WidgetWrapper implements java.io.Serializable {
 
- private final static String WIDGET_PARAMETER = "widget";
- private final static char WIDGET_SEPARATOR = '@';
+ private static final String WIDGET_PARAMETER = "widget";
+ private static final char WIDGET_SEPARATOR = '@';
 
  private Boolean widgetView;
  private String widgetHome;

diff --git a/...ard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProvider.java b/...ard/iq/dataverse/authorization/providers/oauth2/AbstractOAuth2AuthenticationProvider.java
@@ -30,7 +30,7 @@
  */
 public abstract class AbstractOAuth2AuthenticationProvider implements AuthenticationProvider {
 
- final static Logger logger = Logger.getLogger(AbstractOAuth2AuthenticationProvider.class.getName());
+ static final Logger logger = Logger.getLogger(AbstractOAuth2AuthenticationProvider.class.getName());
 
  protected static class ParsedUserResponse {
  public final AuthenticatedUserDisplayInfo displayInfo;

diff --git a/...main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java b/...main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
@@ -49,7 +49,7 @@
  */
 public class OrcidOAuth2AP extends AbstractOAuth2AuthenticationProvider {
 
- final static Logger logger = Logger.getLogger(OrcidOAuth2AP.class.getName());
+ static final Logger logger = Logger.getLogger(OrcidOAuth2AP.class.getName());
 
  public static final String PROVIDER_ID_PRODUCTION = "orcid";
  public static final String PROVIDER_ID_SANDBOX = "orcid-sandbox";

diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/DataverseRequest.java
@@ -26,9 +26,9 @@ public class DataverseRequest {
  private final String invocationId;
  private final HttpServletRequest httpServletRequest;
 
- private final static String undefined = "0.0.0.0";
+ private static final String undefined = "0.0.0.0";
 
- private final static String MDKEY_PREFIX="mdkey.";
+ private static final String MDKEY_PREFIX="mdkey.";
 
  private static final Logger logger = Logger.getLogger(DataverseRequest.class.getName());
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java b/src/main/java/edu/harvard/iq/dataverse/util/ShapefileHandler.java
@@ -68,12 +68,12 @@ public class ShapefileHandler{
  private static final Logger logger = Logger.getLogger(ShapefileHandler.class.getCanonicalName());
 
  // Reference for these extensions: http://en.wikipedia.org/wiki/Shapefile
- public final static String SHAPEFILE_FILE_TYPE = "application/zipped-shapefile";
- public final static String SHAPEFILE_FILE_TYPE_FRIENDLY_NAME = "Shapefile as ZIP Archive";
- public final static List<String> SHAPEFILE_MANDATORY_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj");
- public final static String SHP_XML_EXTENSION = "shp.xml";
- public final static String BLANK_EXTENSION = "__PLACEHOLDER-FOR-BLANK-EXTENSION__";
- 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);
+ public static final String SHAPEFILE_FILE_TYPE = "application/zipped-shapefile";
+ public static final String SHAPEFILE_FILE_TYPE_FRIENDLY_NAME = "Shapefile as ZIP Archive";
+ public static final List<String> SHAPEFILE_MANDATORY_EXTENSIONS = Arrays.asList("shp", "shx", "dbf", "prj");
+ public static final String SHP_XML_EXTENSION = "shp.xml";
+ public static final String BLANK_EXTENSION = "__PLACEHOLDER-FOR-BLANK-EXTENSION__";
+ 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);
 
  public boolean DEBUG = false;
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
@@ -87,8 +87,8 @@ public class SystemConfig {
  private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_IMAGE = 3000000L; // 3 MB
  private static final long DEFAULT_THUMBNAIL_SIZE_LIMIT_PDF = 1000000L; // 1 MB
 
- public final static String DEFAULTCURATIONLABELSET = "DEFAULT";
- public final static String CURATIONLABELSDISABLED = "DISABLED";
+ public static final String DEFAULTCURATIONLABELSET = "DEFAULT";
+ public static final String CURATIONLABELSDISABLED = "DISABLED";
 
  public String getVersion() {
  return getVersion(false);
@@ -473,7 +473,7 @@ public Integer getSearchHighlightFragmentSize() {
  String fragSize = settingsService.getValueForKey(SettingsServiceBean.Key.SearchHighlightFragmentSize);
  if (fragSize != null) {
  try {
- return new Integer(fragSize);
+ return Integer.valueOf(fragSize);
  } catch (NumberFormatException nfe) {
  logger.info("Could not convert " + SettingsServiceBean.Key.SearchHighlightFragmentSize + " to int: " + nfe);
  }
@@ -490,7 +490,7 @@ public long getTabularIngestSizeLimit() {
 
  if (limitEntry != null) {
  try {
- Long sizeOption = new Long(limitEntry);
+ Long sizeOption = Long.valueOf(limitEntry);
  return sizeOption;
  } catch (NumberFormatException nfe) {
  logger.warning("Invalid value for TabularIngestSizeLimit option? - " + limitEntry);
@@ -515,7 +515,7 @@ public long getTabularIngestSizeLimit(String formatName) {
 
  if (limitEntry != null) {
  try {
- Long sizeOption = new Long(limitEntry);
+ Long sizeOption = Long.valueOf(limitEntry);
  return sizeOption;
  } catch (NumberFormatException nfe) {
  logger.warning("Invalid value for TabularIngestSizeLimit:" + formatName + "? - " + limitEntry );
@@ -1061,7 +1061,7 @@ public long getDatasetValidationSizeLimit() {
 
  if (limitEntry != null) {
  try {
- Long sizeOption = new Long(limitEntry);
+ Long sizeOption = Long.valueOf(limitEntry);
  return sizeOption;
  } catch (NumberFormatException nfe) {
  logger.warning("Invalid value for DatasetValidationSizeLimit option? - " + limitEntry);
@@ -1076,7 +1076,7 @@ public long getFileValidationSizeLimit() {
 
  if (limitEntry != null) {
  try {
- Long sizeOption = new Long(limitEntry);
+ Long sizeOption = Long.valueOf(limitEntry);
  return sizeOption;
  } catch (NumberFormatException nfe) {
  logger.warning("Invalid value for FileValidationSizeLimit option? - " + limitEntry);

diff --git a/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/validation/PasswordValidatorServiceBean.java
@@ -13,6 +13,7 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -83,8 +84,7 @@ private enum ValidatorTypes {
  GoodStrengthValidator, StandardValidator
  }
 
- @SuppressWarnings("unchecked")
- private final static LinkedHashMap<ValidatorTypes, PasswordValidator> validators = new LinkedHashMap(2);
+ private static final Map<ValidatorTypes, PasswordValidator> validators = new LinkedHashMap<>(2);
  private int goodStrength;
  private int maxLength;
  private int minLength;
@@ -100,7 +100,7 @@ private enum ValidatorTypes {
  public PasswordValidatorServiceBean() {
  final Properties properties = PropertiesMessageResolver.getDefaultProperties();
  properties.setProperty(GoodStrengthRule.ERROR_CODE_GOODSTRENGTH, GoodStrengthRule.ERROR_MESSAGE_GOODSTRENGTH);
-  messageResolver = new PropertiesMessageResolver(properties);
+ messageResolver = new PropertiesMessageResolver(properties);
  }
 
  public PasswordValidatorServiceBean(List<CharacterRule> characterRules) {

diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticationProviderTest.java
@@ -15,7 +15,7 @@
 
 public class AuthenticationProviderTest {
 
- private final static String[] authProviders = {"null", "builtin", "github", "google", "orcid", "orcid-sandbox", "shib"};
+ private static final String[] authProviders = {"null", "builtin", "github", "google", "orcid", "orcid-sandbox", "shib"};
  private static Map<String, String> bundleTestMap;
 
  @BeforeAll