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

Replace duplicated literals with manifest constants.

Browse Source
This commit is contained in:
Mark H. Wood
2025-04-01 13:38:47 -04:00
parent fb91feaafe
commit 852549b1f1
9 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
View File

@@ -1426,11 +1426,11 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
if (bundleName == null) { if (bundleName == null) {
// is it license.txt? // is it license.txt?
if ("license.txt".equals(fileName)) { if (Constants.LICENSE_BITSTREAM_NAME.equals(fileName)) {
newBundleName = "LICENSE"; newBundleName = Constants.LICENSE_BUNDLE_NAME;
} else { } else {
// call it ORIGINAL // call it ORIGINAL
newBundleName = "ORIGINAL"; newBundleName = Constants.CONTENT_BUNDLE_NAME;
} }
} }
@@ -1494,11 +1494,11 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
if (StringUtils.isBlank(bundleName)) { if (StringUtils.isBlank(bundleName)) {
// is it license.txt? // is it license.txt?
if (bitstreamPath.endsWith("license.txt")) { if (bitstreamPath.endsWith(Constants.LICENSE_BITSTREAM_NAME)) {
newBundleName = "LICENSE"; newBundleName = Constants.LICENSE_BUNDLE_NAME;
} else { } else {
// call it ORIGINAL // call it ORIGINAL
newBundleName = "ORIGINAL"; newBundleName = Constants.CONTENT_BUNDLE_NAME;
} }
} }

7
dspace-api/src/main/java/org/dspace/app/itemupdate/AddBitstreamsAction.java
View File

@@ -27,6 +27,7 @@ import org.dspace.content.Item;
import org.dspace.content.factory.ContentServiceFactory; import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.BitstreamFormatService; import org.dspace.content.service.BitstreamFormatService;
import org.dspace.content.service.InstallItemService; import org.dspace.content.service.InstallItemService;
import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.eperson.Group; import org.dspace.eperson.Group;
import org.dspace.eperson.factory.EPersonServiceFactory; import org.dspace.eperson.factory.EPersonServiceFactory;
@@ -138,10 +139,10 @@ public class AddBitstreamsAction extends UpdateBitstreamsAction {
String newBundleName = ce.bundlename; String newBundleName = ce.bundlename;
if (ce.bundlename == null) { // should be required but default convention established if (ce.bundlename == null) { // should be required but default convention established
if (ce.filename.equals("license.txt")) { if (ce.filename.equals(Constants.LICENSE_BITSTREAM_NAME)) {
newBundleName = "LICENSE"; newBundleName = Constants.LICENSE_BUNDLE_NAME;
} else { } else {
newBundleName = "ORIGINAL"; newBundleName = Constants.CONTENT_BUNDLE_NAME;
} }
} }
ItemUpdate.pr(" Bitstream " + ce.filename + " to be added to bundle: " + newBundleName); ItemUpdate.pr(" Bitstream " + ce.filename + " to be added to bundle: " + newBundleName);

2
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -594,7 +594,7 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
public void removeDSpaceLicense(Context context, Item item) throws SQLException, AuthorizeException, IOException { public void removeDSpaceLicense(Context context, Item item) throws SQLException, AuthorizeException, IOException {
// get all bundles with name "LICENSE" (these are the DSpace license // get all bundles with name "LICENSE" (these are the DSpace license
// bundles) // bundles)
List<Bundle> bunds = getBundles(item, "LICENSE"); List<Bundle> bunds = getBundles(item, Constants.LICENSE_BUNDLE_NAME);
for (Bundle bund : bunds) { for (Bundle bund : bunds) {
// FIXME: probably serious troubles with Authorizations // FIXME: probably serious troubles with Authorizations

5
dspace-api/src/main/java/org/dspace/content/LicenseUtils.java
View File

@@ -22,6 +22,7 @@ import org.dspace.content.service.BitstreamFormatService;
import org.dspace.content.service.BitstreamService; import org.dspace.content.service.BitstreamService;
import org.dspace.content.service.CollectionService; import org.dspace.content.service.CollectionService;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;
import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.eperson.EPerson; import org.dspace.eperson.EPerson;
@@ -139,10 +140,10 @@ public class LicenseUtils {
// Store text as a bitstream // Store text as a bitstream
byte[] licenseBytes = licenseText.getBytes("UTF-8"); byte[] licenseBytes = licenseText.getBytes("UTF-8");
ByteArrayInputStream bais = new ByteArrayInputStream(licenseBytes); ByteArrayInputStream bais = new ByteArrayInputStream(licenseBytes);
Bitstream b = itemService.createSingleBitstream(context, bais, item, "LICENSE"); Bitstream b = itemService.createSingleBitstream(context, bais, item, Constants.LICENSE_BUNDLE_NAME);
// Now set the format and name of the bitstream // Now set the format and name of the bitstream
b.setName(context, "license.txt"); b.setName(context, Constants.LICENSE_BITSTREAM_NAME);
b.setSource(context, "Written by org.dspace.content.LicenseUtils"); b.setSource(context, "Written by org.dspace.content.LicenseUtils");
DCDate acceptanceDCDate = DCDate.getCurrent(); DCDate acceptanceDCDate = DCDate.getCurrent();

3
dspace-api/src/main/java/org/dspace/contentreport/Filter.java
View File

@@ -26,6 +26,7 @@ import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.Bundle; import org.dspace.content.Bundle;
import org.dspace.content.Item; import org.dspace.content.Item;
import org.dspace.contentreport.ItemFilterUtil.BundleName; import org.dspace.contentreport.ItemFilterUtil.BundleName;
import org.dspace.core.Constants;
import org.dspace.core.Context; import org.dspace.core.Context;
import org.dspace.services.factory.DSpaceServicesFactory; import org.dspace.services.factory.DSpaceServicesFactory;
@@ -268,7 +269,7 @@ public enum Filter {
HAS_LICENSE_DOCUMENTATION(FilterCategory.BUNDLE, (context, item) -> { HAS_LICENSE_DOCUMENTATION(FilterCategory.BUNDLE, (context, item) -> {
List<String> names = ItemFilterUtil.getBitstreamNames(BundleName.LICENSE, item); List<String> names = ItemFilterUtil.getBitstreamNames(BundleName.LICENSE, item);
return names.stream() return names.stream()
.anyMatch(name -> !name.equals("license.txt")); .anyMatch(name -> !name.equals(Constants.LICENSE_BITSTREAM_NAME));
}), }),
/** /**

12
dspace-api/src/test/java/org/dspace/content/ItemTest.java
View File

@@ -1095,7 +1095,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
public void testRemoveDSpaceLicenseAuth() throws Exception { public void testRemoveDSpaceLicenseAuth() throws Exception {
// First create a bundle for test // First create a bundle for test
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
String name = "LICENSE"; String name = Constants.LICENSE_BUNDLE_NAME;
Bundle created = bundleService.create(context, it, name); Bundle created = bundleService.create(context, it, name);
created.setName(context, name); created.setName(context, name);
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -1117,7 +1117,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
public void testRemoveDSpaceLicenseNoAuth() throws Exception { public void testRemoveDSpaceLicenseNoAuth() throws Exception {
// First create a bundle for test // First create a bundle for test
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
String name = "LICENSE"; String name = Constants.LICENSE_BUNDLE_NAME;
Bundle created = bundleService.create(context, it, name); Bundle created = bundleService.create(context, it, name);
created.setName(context, name); created.setName(context, name);
context.restoreAuthSystemState(); context.restoreAuthSystemState();
@@ -1133,7 +1133,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
public void testRemoveLicensesAuth() throws Exception { public void testRemoveLicensesAuth() throws Exception {
// First create test content // First create test content
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
String name = "LICENSE"; String name = Constants.LICENSE_BUNDLE_NAME;
Bundle created = bundleService.create(context, it, name); Bundle created = bundleService.create(context, it, name);
created.setName(context, name); created.setName(context, name);
@@ -1167,7 +1167,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
public void testRemoveLicensesNoAuth() throws Exception { public void testRemoveLicensesNoAuth() throws Exception {
// First create test content // First create test content
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
String name = "LICENSE"; String name = Constants.LICENSE_BUNDLE_NAME;
Bundle created = bundleService.create(context, it, name); Bundle created = bundleService.create(context, it, name);
created.setName(context, name); created.setName(context, name);
@@ -1376,7 +1376,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
public void testReplaceAllBitstreamPolicies() throws Exception { public void testReplaceAllBitstreamPolicies() throws Exception {
context.turnOffAuthorisationSystem(); context.turnOffAuthorisationSystem();
//we add some bundles for the test //we add some bundles for the test
String name = "LICENSE"; String name = Constants.LICENSE_BUNDLE_NAME;
Bundle created = bundleService.create(context, it, name); Bundle created = bundleService.create(context, it, name);
created.setName(context, name); created.setName(context, name);
@@ -1451,7 +1451,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
} }
//we add some bundles for the test //we add some bundles for the test
String name = "LICENSE"; String name = Constants.LICENSE_BUNDLE_NAME;
Bundle created = bundleService.create(context, it, name); Bundle created = bundleService.create(context, it, name);
created.setName(context, name); created.setName(context, name);

4
dspace-api/src/test/java/org/dspace/content/LicenseUtilsTest.java
View File

@@ -31,6 +31,7 @@ import org.dspace.content.service.CommunityService;
import org.dspace.content.service.InstallItemService; import org.dspace.content.service.InstallItemService;
import org.dspace.content.service.ItemService; import org.dspace.content.service.ItemService;
import org.dspace.content.service.WorkspaceItemService; import org.dspace.content.service.WorkspaceItemService;
import org.dspace.core.Constants;
import org.dspace.core.factory.CoreServiceFactory; import org.dspace.core.factory.CoreServiceFactory;
import org.dspace.core.service.LicenseService; import org.dspace.core.service.LicenseService;
import org.dspace.eperson.EPerson; import org.dspace.eperson.EPerson;
@@ -259,7 +260,8 @@ public class LicenseUtilsTest extends AbstractUnitTest {
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
IOUtils.copy( IOUtils.copy(
bitstreamService.retrieve(context, itemService.getBundles(item, "LICENSE").get(0).getBitstreams().get(0)), bitstreamService.retrieve(context,
itemService.getBundles(item, Constants.LICENSE_BUNDLE_NAME).get(0).getBitstreams().get(0)),
writer, StandardCharsets.UTF_8); writer, StandardCharsets.UTF_8);
String license = writer.toString(); String license = writer.toString();

10
dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java
View File

@@ -2167,7 +2167,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
.build(); .build();
Bundle license = BundleBuilder.createBundle(context, publicItem1) Bundle license = BundleBuilder.createBundle(context, publicItem1)
.withName("LICENSE") .withName(Constants.LICENSE_BUNDLE_NAME)
.build(); .build();
String bitstreamContent = "This is an archived bitstream"; String bitstreamContent = "This is an archived bitstream";
@@ -2221,7 +2221,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
.build(); .build();
Bundle license = BundleBuilder.createBundle(context, publicItem1) Bundle license = BundleBuilder.createBundle(context, publicItem1)
.withName("LICENSE") .withName(Constants.LICENSE_BUNDLE_NAME)
.build(); .build();
String bitstreamContent = "This is an archived bitstream"; String bitstreamContent = "This is an archived bitstream";
@@ -2267,7 +2267,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
.build(); .build();
Bundle license = BundleBuilder.createBundle(context, publicItem1) Bundle license = BundleBuilder.createBundle(context, publicItem1)
.withName("LICENSE") .withName(Constants.LICENSE_BUNDLE_NAME)
.build(); .build();
String bitstreamContent = "This is an archived bitstream"; String bitstreamContent = "This is an archived bitstream";
@@ -2332,7 +2332,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
.build(); .build();
Bundle license = BundleBuilder.createBundle(context, publicItem1) Bundle license = BundleBuilder.createBundle(context, publicItem1)
.withName("LICENSE") .withName(Constants.LICENSE_BUNDLE_NAME)
.build(); .build();
String bitstreamContent = "This is an archived bitstream"; String bitstreamContent = "This is an archived bitstream";
@@ -2372,7 +2372,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
.build(); .build();
Bundle license = BundleBuilder.createBundle(context, publicItem1) Bundle license = BundleBuilder.createBundle(context, publicItem1)
.withName("LICENSE") .withName(Constants.LICENSE_BUNDLE_NAME)
.build(); .build();
String bitstreamContent = "This is an archived bitstream"; String bitstreamContent = "This is an archived bitstream";

2
dspace-server-webapp/src/test/java/org/dspace/app/rest/signposting/controller/LinksetRestControllerIT.java
View File

@@ -358,7 +358,7 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
} }
try (InputStream is = IOUtils.toInputStream("test", CharEncoding.UTF_8)) { try (InputStream is = IOUtils.toInputStream("test", CharEncoding.UTF_8)) {
Bitstream bitstream4 = BitstreamBuilder.createBitstream(context, item, is, "LICENSE") Bitstream bitstream4 = BitstreamBuilder.createBitstream(context, item, is, Constants.LICENSE_BUNDLE_NAME)
.withName("Bitstream 4") .withName("Bitstream 4")
.withDescription("description") .withDescription("description")
.withMimeType("application/pdf") .withMimeType("application/pdf")