Merge with latest main

ORCID · Jul 18, 2024 · 1280d31 · 1280d31
2 parents e43ac75 + 3201e7e
commit 1280d31
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.62.1 - 2024-07-17
+
+[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.62.0...v2.62.1)
+
 ## v2.62.0 - 2024-07-15
 
 [Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.61.6...v2.62.0)

diff --git a/orcid-core/src/main/java/org/orcid/core/groupIds/issn/IssnClient.java b/orcid-core/src/main/java/org/orcid/core/groupIds/issn/IssnClient.java
@@ -56,6 +56,9 @@ public IssnData getIssnData(String issn) throws BannedException, TooManyRequests
             } else {
                 throw e;
             }
+        } catch (Exception e) {
+            LOG.warn("Error extracting issn data from json returned from issn portal "+ issn);
+            return null;
         }
     }
 

diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/impl/GroupIdRecordManagerImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/impl/GroupIdRecordManagerImpl.java
@@ -133,6 +133,10 @@ private GroupIdRecord createIssnGroupIdRecord(String groupId, String issn) throw
             record.setName(issnData.getMainTitle());
             record.setType("journal");
             return record;
+        } catch(TooManyRequestsException tmre) {
+            //TODO: We are being rate limited, we have to pause
+            LOG.warn("We are being rate limited by the issn portal");
+            throw new InvalidIssnException();
         } catch(UnexpectedResponseCodeException urce) {
             LOG.warn("Unexpected response code {} for issn {}", urce.getReceivedCode(), issn);
             throw new InvalidIssnException();