rename findByDvoOrDie to include the type check

Author: stevenwinship

src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java

@@ -579,8 +579,15 @@ protected DvObject findDvo(@NotNull final String id) throws WrappedResponse {
         return d;
     }
 
+    /**
+     *
+     * @param dvIdtf
+     * @param type
+     * @return DvObject if type matches or throw exception
+     * @throws WrappedResponse
+     */
     @NotNull
-    protected DvObject findDvoOrDie(@NotNull final String dvIdtf, String type) throws WrappedResponse {
+    protected DvObject findDvoByIdAndTypeOrDie(@NotNull final String dvIdtf, String type) throws WrappedResponse {
         try {
             DataverseFeaturedItem.TYPES dvType = DataverseFeaturedItem.getDvType(type);
             DvObject dvObject = isNumeric(dvIdtf) ? findDvo(Long.valueOf(dvIdtf)) : null;

src/main/java/edu/harvard/iq/dataverse/api/DataverseFeaturedItems.java

@@ -63,7 +63,7 @@ public Response updateFeaturedItem(@Context ContainerRequestContext crc,
             if (dataverseFeaturedItem == null) {
                 throw new WrappedResponse(error(Response.Status.NOT_FOUND, MessageFormat.format(BundleUtil.getStringFromBundle("dataverseFeaturedItems.errors.notFound"), id)));
             }
-            DvObject dvObject = (dvObjectIdtf != null) ? findDvoOrDie(dvObjectIdtf, type) : null;
+            DvObject dvObject = (dvObjectIdtf != null) ? findDvoByIdAndTypeOrDie(dvObjectIdtf, type) : null;
             UpdatedDataverseFeaturedItemDTO updatedDataverseFeaturedItemDTO = UpdatedDataverseFeaturedItemDTO.fromFormData(content, displayOrder, keepFile, imageFileInputStream, contentDispositionHeader, type, dvObject);
             return ok(json(execCommand(new UpdateDataverseFeaturedItemCommand(createDataverseRequest(getRequestUser(crc)), dataverseFeaturedItem, updatedDataverseFeaturedItemDTO))));
         } catch (WrappedResponse e) {

src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java

@@ -1803,7 +1803,7 @@ public Response createFeaturedItem(@Context ContainerRequestContext crc,
         try {
             dataverse = findDataverseOrDie(dvIdtf);
             if (dvObjectIdtf != null) {
-                dvObject = findDvoOrDie(dvObjectIdtf, type);
+                dvObject = findDvoByIdAndTypeOrDie(dvObjectIdtf, type);
             }
         } catch (WrappedResponse wr) {
             return wr.getResponse();
@@ -1891,7 +1891,7 @@ public Response updateFeaturedItems(
 
                 // ignore dvObject if the id is missing or an empty string
                 DvObject dvObject = dvObjectIdtf.get(i) != null && !dvObjectIdtf.get(i).isEmpty()
-                        ? findDvoOrDie(dvObjectIdtf.get(i), types.get(i)) : null;
+                        ? findDvoByIdAndTypeOrDie(dvObjectIdtf.get(i), types.get(i)) : null;
                 if (ids.get(i) == 0) {
                     newItems.add(NewDataverseFeaturedItemDTO.fromFormData(
                             contents.get(i), displayOrders.get(i), fileInputStream, contentDisposition, types.get(i), dvObject));