diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/rs/AssetsOld.java b/ccm-cms/src/main/java/org/librecms/contentsection/rs/AssetsOld.java deleted file mode 100644 index b18022b31..000000000 --- a/ccm-cms/src/main/java/org/librecms/contentsection/rs/AssetsOld.java +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Copyright (C) 2017 LibreCCM Foundation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package org.librecms.contentsection.rs; - -import com.arsdigita.kernel.KernelConfig; - -import org.libreccm.l10n.GlobalizationHelper; -import org.librecms.contentsection.Asset; -import org.librecms.contentsection.AssetRepository; - -import org.librecms.contentsection.ContentSection; -import org.librecms.contentsection.ContentSectionRepository; -import org.librecms.contentsection.Folder; -import org.librecms.contentsection.FolderRepository; -import org.librecms.contentsection.FolderType; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.ResourceBundle; -import java.util.stream.Collectors; - -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.transaction.Transactional; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.librecms.assets.AssetTypeInfo; -import org.librecms.assets.AssetTypesManager; - -import javax.ws.rs.NotFoundException; - -/** - * - * @author Jens Pelzetter - */ -@RequestScoped -@Path("/{content-section}/assets") -public class AssetsOld { - - @Inject - private AssetRepository assetRepo; - - @Inject - private AssetTypesManager assetTypesManager; - - @Inject - private ContentSectionRepository sectionRepo; - - @Inject - private FolderRepository folderRepo; - - @Inject - private GlobalizationHelper globalizationHelper; - - private Class toAssetClass(final String type) { - final Class clazz; - try { - clazz = Class.forName(type); - } catch (ClassNotFoundException ex) { - throw new IllegalArgumentException(String.format( - "Type '%s' is not a valid class.", - type)); - } - - if (clazz.isAssignableFrom(Asset.class)) { - @SuppressWarnings("unchecked") - final Class typeClass - = (Class) clazz; - return typeClass; - } else { - throw new IllegalArgumentException(String.format( - "Type '%s is not a subclass of '%s'.", - type, - Asset.class.getName())); - } - } - - public List findAssets(final ContentSection section, - final String path) { - - final Optional folder = folderRepo - .findByPath(section, - path, - FolderType.ASSETS_FOLDER); - - if (!folder.isPresent()) { - throw new NotFoundException(String.format( - "No asset folder with path '%s' found in content section '%s'.", - path, - section.getLabel())); - } - - return assetRepo.findByFolder(folder.get()); - } - - public List findAssets(final String query, - final Class type) { - return assetRepo.findByTitleAndType(query, type); - - } - - @Transactional(Transactional.TxType.REQUIRED) - public List findAssetsByType(final ContentSection section, - final String path, - final String type) { - - final Optional folder = folderRepo - .findByPath(section, - path, - FolderType.ASSETS_FOLDER); - - if (!folder.isPresent()) { - return Collections.emptyList(); - } - - return assetRepo.filterByFolderAndType(folder.get(), - toAssetClass(type)); - } - - @Transactional(Transactional.TxType.REQUIRED) - public List findAssetsByQuery(final ContentSection section, - final String path, - final String query) { - - final Optional folder = folderRepo - .findByPath(section, - path, - FolderType.ASSETS_FOLDER); - - if (!folder.isPresent()) { - return Collections.emptyList(); - } - - return assetRepo.filterByFolderAndTitle(folder.get(), - query); - } - - @Transactional(Transactional.TxType.REQUIRED) - public List findAssets(final ContentSection section, - final String path, - final String query, - final String type) { - - final Optional folder = folderRepo - .findByPath(section, - path, - FolderType.ASSETS_FOLDER); - - if (!folder.isPresent()) { - return Collections.emptyList(); - } - - return assetRepo.filterByFolderAndTypeAndTitle(folder.get(), - toAssetClass(type), - query); - - } - - @GET - @Produces("text/json") - @Transactional(Transactional.TxType.REQUIRED) - public List> findAssets( - @PathParam("content-section") final String section, - @QueryParam("query") final String query, - @QueryParam("type") final String type) { - - return findAssets(section, "/", query, type); - } - - @GET - @Path("{folder}") - @Produces("text/json") - @Transactional(Transactional.TxType.REQUIRED) - public List> findAssets( - @PathParam("content-section") final String section, - @PathParam("folder") final String path, - @QueryParam("query") final String query, - @QueryParam("type") final String type) { - - final ContentSection contentSection = sectionRepo - .findByLabel(section) - .orElseThrow(() -> new NotFoundException( - String.format("No content section '%s' found.", section))); - - final String folderPath; - if (path == null || path.trim().isEmpty() || "/".equals(path.trim())) { - folderPath = "/"; - } else { - folderPath = String.format("/%s", path); - } - - final String assetType; - if (type == null || type.trim().isEmpty()) { - assetType = Asset.class.getName(); - } else { - assetType = type; - } - - final Optional folder = folderRepo - .findByPath(contentSection, folderPath, FolderType.ASSETS_FOLDER); - if (!folder.isPresent()) { - return Collections.emptyList(); - } - final List> subFolders = folder - .get() - .getSubFolders() - .stream() - .map(current -> createAssetMapEntry(current)) - .collect(Collectors.toList()); - - final List assets; - if (query == null || query.trim().isEmpty()) { - if (Asset.class.getName().equals(assetType)) { - assets = findAssets(contentSection, folderPath); - } else { - assets = findAssetsByType(contentSection, folderPath, assetType); - } - } else { - if (Asset.class.getName().equals(assetType)) { - assets = findAssetsByQuery(contentSection, folderPath, query); - } else { - assets - = findAssets(contentSection, folderPath, query, assetType); - } - } - - final List> assetEntries = assets - .stream() - .map(asset -> createAssetMapEntry(asset)) - .collect(Collectors.toList()); - - final List> result = new ArrayList<>(); - result.addAll(subFolders); - result.addAll(assetEntries); - - return result; - } - - private Map createAssetMapEntry(final Folder folder) { - final Map result = new HashMap<>(); - - result.put("title", - folder - .getTitle() - .getValue(KernelConfig.getConfig().getDefaultLocale())); - result.put("type", - Folder.class.getName()); - - return result; - } - - private Map createAssetMapEntry(final Asset asset) { - final Map result = new HashMap<>(); - - result.put("title", - asset.getTitle().getValue(globalizationHelper - .getNegotiatedLocale())); - - result.put("type", - asset.getClass().getName()); - - final AssetTypeInfo typeInfo = assetTypesManager - .getAssetTypeInfo(asset.getClass()); - final ResourceBundle bundle = ResourceBundle - .getBundle(typeInfo.getLabelBundle(), - globalizationHelper.getNegotiatedLocale()); - result.put("typeLabel", bundle.getString(typeInfo.getLabelKey())); - - return result; - } - -}