xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2385 Fixed subscription backup web page" into development

Browse source 
Former-commit-id: a5df53787e [formerly 540d0e7b9c] [formerly 9e17d68bd1] [formerly a5df53787e [formerly 540d0e7b9c] [formerly 9e17d68bd1] [formerly 472b3b10a3 [formerly 9e17d68bd1 [formerly 73b5da79892dd0781638329e4dd7be56a11e642d]]]]
Former-commit-id: 472b3b10a3
Former-commit-id: 1be34a6708 [formerly 0306778ac2] [formerly 3f1f17b8b8f7c9e5603efd120ec81f4b642d6876 [formerly eb5b61ba85]]
Former-commit-id: dd1b63cdd7cee780019dc244e6a0393018f8ff60 [formerly a02af3bc08]
Former-commit-id: cf210025ae
This commit is contained in:
Richard Peter 2013-10-07 16:21:46 -05:00 • committed by Gerrit Code Review
commit 56e8a04739
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryDataAccessService.java
View file

@ -46,6 +46,7 @@ import com.raytheon.uf.common.registry.services.rest.response.RestCollectionResp
import com.raytheon.uf.common.serialization.JAXBManager; import com.raytheon.uf.common.serialization.JAXBManager;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.util.CollectionUtil;
import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao; import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
/** /**
@ -60,6 +61,7 @@ import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 7/29/2013 2191 bphillip Initial implementation * 7/29/2013 2191 bphillip Initial implementation
* 9/20/2013 2385 bphillip Added subscription backup functions * 9/20/2013 2385 bphillip Added subscription backup functions
* 10/2/2013 2385 bphillip Fixed subscription backup queries
* </pre> * </pre>
* *
* @author bphillip * @author bphillip
@ -76,7 +78,14 @@ public class RegistryDataAccessService implements IRegistryDataAccessService {
System.getProperty("edex.home") System.getProperty("edex.home")
+ "/data/registrySubscriptionBackup"); + "/data/registrySubscriptionBackup");
private static final String GET_SUBSCRIPTIONS_QUERY = "FROM RegistryObjectType obj where lower(obj.objectType) like '%subscription%' order by obj.id asc"; private static final String GET_SINGLE_SUBSCRIPTIONS_QUERY = "FROM RegistryObjectType obj "
+ "where (obj.objectType like '%SiteSubscription' "
+ "OR obj.objectType like '%SharedSubscription') "
+ "AND obj.id=:id";
private static final String GET_SUBSCRIPTIONS_QUERY = "FROM RegistryObjectType obj "
+ "where obj.objectType like '%SiteSubscription' "
+ "OR obj.objectType like '%SharedSubscription' order by obj.id asc";
/** Data access object for registry objects */ /** Data access object for registry objects */
private RegistryObjectDao registryObjectDao; private RegistryObjectDao registryObjectDao;
@ -191,12 +200,14 @@ public class RegistryDataAccessService implements IRegistryDataAccessService {
@PathParam("subscriptionName") String subscriptionName) @PathParam("subscriptionName") String subscriptionName)
throws JAXBException { throws JAXBException {
StringBuilder response = new StringBuilder(); StringBuilder response = new StringBuilder();
RegistryObjectType sub = registryObjectDao.getById(subscriptionName); List<RegistryObjectType> result = registryObjectDao.executeHQLQuery(
GET_SINGLE_SUBSCRIPTIONS_QUERY, "id", subscriptionName);
if (sub == null) { if (CollectionUtil.isNullOrEmpty(result)) {
response.append("Subscription with ID [").append(subscriptionName) response.append("Subscription with ID [").append(subscriptionName)
.append("] not found in registry"); .append("] not found in registry");
} else { } else {
RegistryObjectType sub = result.get(0);
if (!SUBSCRIPTION_BACKUP_DIR.exists()) { if (!SUBSCRIPTION_BACKUP_DIR.exists()) {
SUBSCRIPTION_BACKUP_DIR.mkdirs(); SUBSCRIPTION_BACKUP_DIR.mkdirs();
} }