hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 05:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

77582: Rename formatHandle to parseHandle & add @Override

Browse Source
This commit is contained in:
Yura Bondarenko
2021-03-26 16:20:11 +01:00
parent 315e29d2b1
commit a43e07f89a
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
View File

@@ -386,7 +386,8 @@ public class HandleServiceImpl implements HandleService {
return handleDAO.countRows(context); return handleDAO.countRows(context);
} }
public String formatHandle(String identifier) { @Override
public String parseHandle(String identifier) {
if (identifier == null) { if (identifier == null) {
return null; return null;
} }

2
dspace-api/src/main/java/org/dspace/handle/service/HandleService.java
View File

@@ -191,5 +191,5 @@ public interface HandleService {
* @param identifier * @param identifier
* @return * @return
*/ */
String formatHandle(String identifier); String parseHandle(String identifier);
} }

4
dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java
View File

@@ -60,7 +60,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
@Override @Override
public boolean supports(String identifier) { public boolean supports(String identifier) {
return handleService.formatHandle(identifier) != null; return handleService.parseHandle(identifier) != null;
} }
@Override @Override
@@ -136,7 +136,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
public DSpaceObject resolve(Context context, String identifier, String... attributes) { public DSpaceObject resolve(Context context, String identifier, String... attributes) {
// We can do nothing with this, return null // We can do nothing with this, return null
try { try {
identifier = handleService.formatHandle(identifier); identifier = handleService.parseHandle(identifier);
return handleService.resolveToObject(context, identifier); return handleService.resolveToObject(context, identifier);
} catch (IllegalStateException | SQLException e) { } catch (IllegalStateException | SQLException e) {
log.error(LogManager.getHeader(context, "Error while resolving handle to item", "handle: " + identifier), log.error(LogManager.getHeader(context, "Error while resolving handle to item", "handle: " + identifier),

4
dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
View File

@@ -78,7 +78,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
@Override @Override
public boolean supports(String identifier) { public boolean supports(String identifier) {
return handleService.formatHandle(identifier) != null; return handleService.parseHandle(identifier) != null;
} }
@Override @Override
@@ -284,7 +284,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
public DSpaceObject resolve(Context context, String identifier, String... attributes) { public DSpaceObject resolve(Context context, String identifier, String... attributes) {
// We can do nothing with this, return null // We can do nothing with this, return null
try { try {
identifier = handleService.formatHandle(identifier); identifier = handleService.parseHandle(identifier);
return handleService.resolveToObject(context, identifier); return handleService.resolveToObject(context, identifier);
} catch (IllegalStateException | SQLException e) { } catch (IllegalStateException | SQLException e) {
log.error(LogManager.getHeader(context, "Error while resolving handle to item", "handle: " + identifier), log.error(LogManager.getHeader(context, "Error while resolving handle to item", "handle: " + identifier),

2
dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
View File

@@ -72,7 +72,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
@Override @Override
public boolean supports(String identifier) { public boolean supports(String identifier) {
return handleService.formatHandle(identifier) != null; return handleService.parseHandle(identifier) != null;
} }
@Override @Override