diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java index e571fd89627..672ed966ff3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldValueValidator.java @@ -140,7 +140,7 @@ public boolean isValid(DatasetFieldValue value, ConstraintValidatorContext conte try { Double.parseDouble(value.getValue()); } catch (Exception e) { - logger.fine("Float value failed validation: " + value.getValue() + " (" + dsfType.getDisplayName() + ")"); + logger.warning("Float value failed validation: " + value.getValue() + " (" + dsfType.getDisplayName() + ")"); try { context.buildConstraintViolationWithTemplate(dsfType.getDisplayName() + " is not a valid number.").addConstraintViolation(); } catch (NullPointerException npe) { diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java index a73fd6f0911..938f08f88a9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetLinkingServiceBean.java @@ -74,7 +74,7 @@ public DatasetLinkingDataverse findDatasetLinkingDataverse(Long datasetId, Long .setParameter("dataverseId", linkingDataverseId) .getSingleResult(); } catch (javax.persistence.NoResultException e) { - logger.fine("no datasetLinkingDataverse found for datasetId " + datasetId + " and linkingDataverseId " + linkingDataverseId); + logger.warning("no datasetLinkingDataverse found for datasetId " + datasetId + " and linkingDataverseId " + linkingDataverseId); } return foundDatasetLinkingDataverse; } diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 508a561f149..5cdc4e60a86 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -742,7 +742,7 @@ public boolean isThisVersionSearchable() { try { queryResponse = solrClientService.getSolrClient().query(solrQuery); } catch (Exception ex) { - logger.fine("Solr exception: " + ex.getLocalizedMessage()); + logger.warning("Solr exception: " + ex.getLocalizedMessage()); // solr maybe down/some error may have occurred... return false; } @@ -857,7 +857,7 @@ public Set getFileIdsInVersionFromSolr(Long datasetVersionId, String patte try { queryResponse = solrClientService.getSolrClient().query(solrQuery); } catch (HttpSolrClient.RemoteSolrException ex) { - logger.fine("Remote Solr Exception: " + ex.getLocalizedMessage()); + logger.warning("Remote Solr Exception: " + ex.getLocalizedMessage()); String msg = ex.getLocalizedMessage(); if (msg.contains(SearchFields.FILE_DELETED)) { fileDeletedFlagNotIndexed = true; @@ -959,7 +959,7 @@ public SwiftAccessIO getSwiftObject() { logger.fine("DatasetPage: Failed to cast storageIO as SwiftAccessIO (most likely because storageIO is a FileAccessIO)"); } } catch (IOException e) { - logger.fine("DatasetPage: Failed to get storageIO"); + logger.warning("DatasetPage: Failed to get storageIO"); } return null; diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java index e106272e4ec..f3faeed0c44 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseLinkingServiceBean.java @@ -70,7 +70,7 @@ public DataverseLinkingDataverse findDataverseLinkingDataverse(Long dataverseId, .setParameter("linkingDataverseId", linkingDataverseId) .getSingleResult(); } catch (javax.persistence.NoResultException e) { - logger.fine("No DataverseLinkingDataverse found for dataverseId " + dataverseId + " and linkedDataverseId " + linkingDataverseId); + logger.warning("No DataverseLinkingDataverse found for dataverseId " + dataverseId + " and linkedDataverseId " + linkingDataverseId); } return foundDataverseLinkingDataverse; } diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java index e1f8c80701c..038a4b5945b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java @@ -204,7 +204,7 @@ public Dataverse findByAlias(String anAlias) { .setParameter("alias", anAlias.toLowerCase()) .getSingleResult(); } catch ( NoResultException|NonUniqueResultException ex ) { - logger.fine("Unable to find a single dataverse using alias \"" + anAlias + "\": " + ex); + logger.warning("Unable to find a single dataverse using alias \"" + anAlias + "\": " + ex); return null; } } diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java index e41f710690b..9e201a0d715 100644 --- a/src/main/java/edu/harvard/iq/dataverse/FilePage.java +++ b/src/main/java/edu/harvard/iq/dataverse/FilePage.java @@ -737,10 +737,10 @@ public SwiftAccessIO getSwiftObject() { if (storageIO != null && storageIO instanceof SwiftAccessIO) { return (SwiftAccessIO)storageIO; } else { - logger.fine("FilePage: Failed to cast storageIO as SwiftAccessIO"); + logger.warning("FilePage: Failed to cast storageIO as SwiftAccessIO"); } } catch (IOException e) { - logger.fine("FilePage: Failed to get storageIO"); + logger.warning("FilePage: Failed to get storageIO"); } return null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java index 88084919acf..19964a8eb47 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java +++ b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java @@ -237,7 +237,7 @@ public void handleImageFooterFileUpload(FileUploadEvent event) { editDv.getDataverseTheme().setLogoFooter(uFile.getFileName()); } catch (IOException e) { - logger.finer("caught IOException"); + logger.warning("Error uploading logo file: " + e); logger.throwing("ThemeWidgetFragment", "handleImageFileUpload", e); throw new RuntimeException("Error uploading logo file", e); // improve error handling } diff --git a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java index b75811e6698..edebe137992 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java @@ -373,7 +373,7 @@ public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, Harve importedDataset = engineSvc.submit(new CreateHarvestedDatasetCommand(ds, dataverseRequest)); } catch (JsonParseException | ImportException | CommandException ex) { - logger.fine("Failed to import harvested dataset: " + ex.getClass() + ": " + ex.getMessage()); + logger.warning("Failed to import harvested dataset: " + ex.getClass() + ": " + ex.getMessage()); FileOutputStream savedJsonFileStream = new FileOutputStream(new File(metadataFile.getAbsolutePath() + ".json")); byte[] jsonBytes = json.getBytes(); int i = 0; diff --git a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java index b45bc6190ca..52c07e52f47 100644 --- a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java @@ -176,7 +176,7 @@ private ConfirmEmailData findSingleConfirmEmailDataByToken(String token) { try { confirmEmailData = typedQuery.getSingleResult(); } catch (NoResultException | NonUniqueResultException ex) { - logger.fine("When looking up " + token + " caught " + ex); + logger.warning("When looking up " + token + " caught " + ex); } return confirmEmailData; } @@ -188,7 +188,7 @@ public ConfirmEmailData findSingleConfirmEmailDataByUser(AuthenticatedUser user) try { confirmEmailData = typedQuery.getSingleResult(); } catch (NoResultException | NonUniqueResultException ex) { - logger.fine("When looking up user " + user + " caught " + ex); + logger.warning("When looking up user " + user + " caught " + ex); } return confirmEmailData; } diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java index a627df0dbb3..a9991a7284f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java +++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/DataConverter.java @@ -95,7 +95,7 @@ public static StorageIO performFormatConversion(DataFile file, Storage convertedFileStream = Channels.newInputStream((ReadableByteChannel) storageIO.openAuxChannel(formatRequested)); convertedFileSize = storageIO.getAuxObjectSize(formatRequested); } catch (IOException ioex) { - logger.fine("No cached copy for file format "+formatRequested+", file "+file.getStorageIdentifier()); + logger.warning("No cached copy for file format "+formatRequested+", file "+file.getStorageIdentifier()); convertedFileStream = null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java index 81b10567a78..8b43de40e98 100644 --- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java +++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java @@ -312,7 +312,7 @@ private static boolean generateWorldMapThumbnail(StorageIO storageIO, return false; } } catch (FileNotFoundException fnfe) { - logger.fine("No .img file for this worldmap file yet; giving up. Original Error: " + fnfe); + logger.warning("No .img file for this worldmap file yet; giving up. Original Error: " + fnfe); return false; } catch (IOException ioex) { @@ -365,7 +365,7 @@ private static boolean generateImageThumbnailFromInputStream(StorageIO outputStream = Channels.newOutputStream((WritableByteChannel) outputChannel); logger.fine("Opened an auxiliary channel/output stream " + THUMBNAIL_SUFFIX + size + " on " + storageIO.getDataFile().getStorageIdentifier()); } catch (Exception ioex) { - logger.fine("Failed to open an auxiliary channel/output stream " + THUMBNAIL_SUFFIX + size + " on " + storageIO.getDataFile().getStorageIdentifier()); + logger.warning("Failed to open an auxiliary channel/output stream " + THUMBNAIL_SUFFIX + size + " on " + storageIO.getDataFile().getStorageIdentifier()); tempFileRequired = true; } @@ -374,7 +374,7 @@ private static boolean generateImageThumbnailFromInputStream(StorageIO tempFile = File.createTempFile("tempFileToRescale", ".tmp"); outputStream = new FileOutputStream(tempFile); } catch (IOException ioex) { - logger.fine("GenerateImageThumb: failed to open a temporary file."); + logger.warning("GenerateImageThumb: failed to open a temporary file."); return false; } } @@ -410,7 +410,7 @@ private static boolean isThumbnailCached(StorageIO storageIO, int size try { cached = storageIO.isAuxObjectCached(THUMBNAIL_SUFFIX + size); } catch (Exception ioex) { - logger.fine("caught Exception while checking for a cached thumbnail (file " + storageIO.getDataFile().getStorageIdentifier() + ")"); + logger.warning("caught Exception while checking for a cached thumbnail (file " + storageIO.getDataFile().getStorageIdentifier() + ")"); return false; } @@ -445,7 +445,7 @@ public static String getImageThumbnailAsBase64(DataFile file, int size) { try { storageIO = file.getStorageIO(); } catch (Exception ioEx) { - logger.fine("Caught an exception while trying to obtain a thumbnail as Base64 string - could not open StorageIO on the datafile."); + logger.warning("Caught an exception while trying to obtain a thumbnail as Base64 string - could not open StorageIO on the datafile."); return null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java index d2429f6ebe7..ba073eece94 100644 --- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java +++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java @@ -732,7 +732,7 @@ public InputStream getAuxFileAsInputStream(String auxItemTag) throws IOException } return null; } catch (AmazonClientException ase) { - logger.fine("Caught an AmazonClientException in S3AccessIO.getAuxFileAsInputStream() (object not cached?): " + ase.getMessage()); + logger.warning("Caught an AmazonClientException in S3AccessIO.getAuxFileAsInputStream() (object not cached?): " + ase.getMessage()); return null; } } diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java index b844a9d109f..e40f139c6cf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java @@ -129,7 +129,7 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data in = dataAccess.getAuxFileAsInputStream(datasetLogoThumbnail + thumb48addedByImageThumbConverter); } } catch (IOException ex) { - logger.fine("Dataset-level thumbnail file does not exist, or failed to open; will try to find an image file that can be used as the thumbnail."); + logger.warning("Dataset-level thumbnail file does not exist, or failed to open; will try to find an image file that can be used as the thumbnail."); } @@ -141,7 +141,7 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data logger.fine("will get thumbnail from dataset logo"); return datasetThumbnail; } catch (IOException ex) { - logger.fine("Unable to read thumbnail image from file: " + ex); + logger.warning("Unable to read thumbnail image from file: " + ex); return null; } finally { @@ -344,7 +344,7 @@ public static Dataset persistDatasetLogoToStorageAndCreateThumbnail(Dataset data try { Files.delete(Paths.get(thumbFileLocation)); } catch (IOException ioex) { - logger.fine("Failed to delete temporary thumbnail file"); + logger.warning("Failed to delete temporary thumbnail file"); } logger.fine("Thumbnail saved to " + thumbFileLocation + ". Temporary file deleted : " + tmpFileWasDeleted + ". Original file deleted : " + originalTempFileWasDeleted); diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java index 0af73550190..804e91e17fb 100644 --- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClientServiceBean.java @@ -62,7 +62,7 @@ public HarvestingClient findByNickname(String nickName) { .setParameter("nickName", nickName.toLowerCase()) .getSingleResult(); } catch ( NoResultException|NonUniqueResultException ex ) { - logger.fine("Unable to find a single harvesting client by nickname \"" + nickName + "\": " + ex); + logger.warning("Unable to find a single harvesting client by nickname \"" + nickName + "\": " + ex); return null; } } diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java index 973c712b5c8..76a8cab0f72 100644 --- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java @@ -244,7 +244,7 @@ public void exportAllFormatsInNewTransaction(Dataset dataset) throws ExportExcep exportServiceInstance.exportAllFormats(dataset); datasetService.updateLastExportTimeStamp(dataset.getId()); } catch (Exception e) { - logger.fine("Caught unknown exception while trying to export"); + logger.warning("Caught unknown exception while trying to export"); throw new ExportException(e.getMessage()); } } @@ -348,7 +348,7 @@ public List findOaiRecordsBySetName(String setName, Date from, Date u try { return query.getResultList(); } catch (Exception ex) { - logger.fine("Caught exception; returning null."); + logger.warning("Caught exception; returning null."); return null; } } @@ -367,7 +367,7 @@ public List findActiveOaiRecordsBySetName(String setName) { try { return query.getResultList(); } catch (Exception ex) { - logger.fine("Caught exception; returning null."); + logger.warning("Caught exception; returning null."); return null; } } @@ -386,7 +386,7 @@ public List findDeletedOaiRecordsBySetName(String setName) { try { return query.getResultList(); } catch (Exception ex) { - logger.fine("Caught exception; returning null."); + logger.warning("Caught exception; returning null."); return null; } } diff --git a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java index 0a092f36851..10342108106 100644 --- a/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlUtil.java @@ -41,7 +41,7 @@ public static RoleAssignee identifier2roleAssignee(String identifier) { try { datasetId = new Long(parts[1]); } catch (ArrayIndexOutOfBoundsException | NumberFormatException ex) { - logger.fine("Could not find dataset id in '" + identifier + "': " + ex); + logger.warning("Could not find dataset id in '" + identifier + "': " + ex); return null; } return new PrivateUrlUser(datasetId); diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java index 3eb3c290208..4a560d91b5f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java @@ -387,7 +387,7 @@ public Future indexDataset(Dataset dataset, boolean doNormalSolrDocClean List allFilesForDataset = findFilesOfParentDataset(dataset.getId()); solrIdsOfFilesToDelete.addAll(allFilesForDataset); } catch (SearchException | NullPointerException ex) { - logger.fine("could not run search of files to delete: " + ex); + logger.warning("could not run search of files to delete: " + ex); } int numFiles = 0; if (fileMetadatas != null) { diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java index 45ce6949127..4b39b146c89 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java @@ -611,7 +611,7 @@ private static boolean isGraphMLFile(File file) { } } } catch(XMLStreamException e) { - logger.fine("XML error - this is not a valid graphML file."); + logger.warning("XML error - this is not a valid graphML file."); isGraphML = false; } catch(IOException e) { throw new EJBException(e); diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java index b8836060069..21f1df5a3fa 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java @@ -714,7 +714,7 @@ public int getPVGoodStrength() { try { goodStrengthLength = Integer.parseInt(_goodStrengthLength); } catch (NumberFormatException nfe) { - logger.fine("Invalid value for PVGoodStrength: " + _goodStrengthLength); + logger.warning("Invalid value for PVGoodStrength: " + _goodStrengthLength); } return goodStrengthLength; } @@ -732,7 +732,7 @@ public int getPVMinLength() { try { passportValidatorMinLength = Integer.parseInt(_passportValidatorMinLength); } catch (NumberFormatException nfe) { - logger.fine("Invalid value for PwMinLength: " + _passportValidatorMinLength); + logger.warning("Invalid value for PwMinLength: " + _passportValidatorMinLength); } return passportValidatorMinLength; } @@ -750,7 +750,7 @@ public int getPVMaxLength() { try { passportValidatorMaxLength = Integer.parseInt(_passportValidatorMaxLength); } catch (NumberFormatException nfe) { - logger.fine("Invalid value for PwMaxLength: " + _passportValidatorMaxLength); + logger.warning("Invalid value for PwMaxLength: " + _passportValidatorMaxLength); } return passportValidatorMaxLength; } @@ -789,7 +789,7 @@ public int getPVNumberOfCharacteristics() { try { numberOfCharacteristics = Integer.parseInt(_numberOfCharacteristics); } catch (NumberFormatException nfe) { - logger.fine("Invalid value for PVNumberOfCharacteristics: " + _numberOfCharacteristics); + logger.warning("Invalid value for PVNumberOfCharacteristics: " + _numberOfCharacteristics); } return numberOfCharacteristics; } @@ -804,7 +804,7 @@ public int getPVNumberOfConsecutiveDigitsAllowed() { try { numConsecutiveDigitsAllowed = Integer.parseInt(_numberOfConsecutiveDigitsAllowed); } catch (NumberFormatException nfe) { - logger.fine("Invalid value for " + SettingsServiceBean.Key.PVNumberOfConsecutiveDigitsAllowed + ": " + _numberOfConsecutiveDigitsAllowed); + logger.warning("Invalid value for " + SettingsServiceBean.Key.PVNumberOfConsecutiveDigitsAllowed + ": " + _numberOfConsecutiveDigitsAllowed); } return numConsecutiveDigitsAllowed; } diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java index cdd50127957..65c706a1532 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java @@ -1693,7 +1693,7 @@ private static byte[] inputStreamToBytes(InputStream inputStream) { try { return IOUtils.toByteArray(inputStream); } catch (IOException ex) { - logger.fine("In inputStreamToBytes but caught an IOUtils.toByteArray Returning null."); + logger.warning("In inputStreamToBytes but caught an IOUtils.toByteArray Returning null."); return null; } }