Skip to content

Commit a290129

Browse files
Refactor the code to include the DateUtils under orcid-utils package (#7071)
* Refactor the code to include the DateUtils under orcid-utils package * Refactored StringUtils from core and persistence packages under utils --------- Co-authored-by: Angel Montenegro <a.montenegro@orcid.org>
1 parent 50850de commit a290129

125 files changed

Lines changed: 174 additions & 377 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

orcid-api-common/src/main/java/org/orcid/api/common/filter/ApiVersionCheckFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.orcid.core.exception.OrcidBadRequestException;
1313
import org.orcid.core.locale.LocaleManager;
1414
import org.orcid.core.manager.impl.OrcidUrlManager;
15-
import org.orcid.core.utils.OrcidStringUtils;
1615
import org.orcid.pojo.ajaxForm.PojoUtil;
16+
import org.orcid.utils.OrcidStringUtils;
1717
import org.springframework.beans.factory.annotation.Autowired;
1818
import org.springframework.web.bind.annotation.RequestMethod;
1919

orcid-api-common/src/main/java/org/orcid/api/common/filter/DefaultApiVersionFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.orcid.core.manager.impl.OrcidUrlManager;
2323
import org.orcid.core.togglz.Features;
2424
import org.orcid.core.utils.JsonUtils;
25-
import org.orcid.core.utils.OrcidStringUtils;
2625
import org.orcid.jaxb.model.v3.release.error.OrcidError;
2726
import org.orcid.pojo.ajaxForm.PojoUtil;
27+
import org.orcid.utils.OrcidStringUtils;
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.web.filter.OncePerRequestFilter;

orcid-api-common/src/main/java/org/orcid/api/common/filter/TokenTargetFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.orcid.core.exception.OrcidUnauthorizedException;
1212
import org.orcid.core.oauth.OrcidOauth2TokenDetailService;
1313
import org.orcid.persistence.jpa.entities.ProfileEntity;
14-
import org.orcid.core.utils.OrcidStringUtils;
14+
import org.orcid.utils.OrcidStringUtils;
1515
import org.springframework.security.core.Authentication;
1616
import org.springframework.security.core.context.SecurityContext;
1717
import org.springframework.security.core.context.SecurityContextHolder;

orcid-api-common/src/main/java/org/orcid/api/common/jaxb/OrcidExceptionMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.orcid.core.manager.impl.OrcidUrlManager;
2828
import org.orcid.core.oauth.OAuthError;
2929
import org.orcid.core.oauth.OAuthErrorUtils;
30-
import org.orcid.core.utils.DateUtils;
31-
import org.orcid.core.utils.OrcidStringUtils;
30+
import org.orcid.utils.DateUtils;
31+
import org.orcid.utils.OrcidStringUtils;
3232
import org.orcid.core.version.ApiSection;
3333
import org.orcid.jaxb.model.message.DeprecatedDate;
3434
import org.orcid.jaxb.model.message.ErrorDesc;

orcid-api-common/src/main/java/org/orcid/api/common/security/oauth/RevokeTokenEndpointFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import javax.servlet.http.HttpServletResponse;
1212

1313
import org.orcid.core.locale.LocaleManager;
14-
import org.orcid.core.utils.OrcidStringUtils;
14+
import org.orcid.utils.OrcidStringUtils;
1515
import org.springframework.security.authentication.AuthenticationProvider;
1616
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
1717
import org.springframework.security.core.Authentication;

orcid-api-web/src/main/java/org/orcid/api/notificationsV2/server/delegator/impl/NotificationsApiServiceDelegatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.orcid.jaxb.model.notification.permission_v2.NotificationPermission;
3232
import org.orcid.jaxb.model.notification_v2.Notification;
3333
import org.orcid.persistence.jpa.entities.ProfileEntity;
34-
import org.orcid.core.utils.DateUtils;
34+
import org.orcid.utils.DateUtils;
3535
import org.springframework.beans.factory.annotation.Value;
3636
import org.springframework.security.core.Authentication;
3737
import org.springframework.security.core.context.SecurityContextHolder;

orcid-api-web/src/test/java/org/orcid/api/memberV2/server/delegator/MemberV2ApiServiceDelegator_ActivitiesSummaryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.orcid.test.DBUnitTest;
5252
import org.orcid.test.OrcidJUnit4ClassRunner;
5353
import org.orcid.test.helper.Utils;
54-
import org.orcid.core.utils.DateUtils;
54+
import org.orcid.utils.DateUtils;
5555
import org.springframework.test.context.ContextConfiguration;
5656

5757
@RunWith(OrcidJUnit4ClassRunner.class)

orcid-api-web/src/test/java/org/orcid/api/memberV2/server/delegator/MemberV2ApiServiceDelegator_GroupIdTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
import org.orcid.test.DBUnitTest;
5050
import org.orcid.test.OrcidJUnit4ClassRunner;
5151
import org.orcid.test.helper.Utils;
52-
import org.orcid.core.utils.DateUtils;
52+
import org.orcid.utils.DateUtils;
5353
import org.springframework.test.context.ContextConfiguration;
5454
import org.springframework.test.util.ReflectionTestUtils;
5555

orcid-api-web/src/test/java/org/orcid/api/memberV2/server/delegator/MemberV2ApiServiceDelegator_WorksTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
import org.orcid.test.OrcidJUnit4ClassRunner;
7676
import org.orcid.test.TargetProxyHelper;
7777
import org.orcid.test.helper.Utils;
78-
import org.orcid.core.utils.DateUtils;
78+
import org.orcid.utils.DateUtils;
7979
import org.springframework.beans.factory.annotation.Value;
8080
import org.springframework.mock.web.MockHttpServletRequest;
8181
import org.springframework.test.context.ContextConfiguration;

orcid-api-web/src/test/java/org/orcid/api/memberV3/server/delegator/MemberV3ApiServiceDelegator_ActivitiesSummaryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.junit.runner.RunWith;
2020
import org.orcid.api.common.util.v3.ActivityUtils;
2121
import org.orcid.core.exception.OrcidUnauthorizedException;
22-
import org.orcid.core.utils.DateUtils;
22+
import org.orcid.utils.DateUtils;
2323
import org.orcid.core.utils.SecurityContextTestUtils;
2424
import org.orcid.jaxb.model.groupid_v2.GroupIdRecord;
2525
import org.orcid.jaxb.model.message.ScopePathType;

0 commit comments

Comments
 (0)