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

Issue #2385 Fixed subscription backup web page

Browse source 
Change-Id: I06905712f279f487ac8298ab40ca22a012d01dbf

Former-commit-id: 2759456eb4 [formerly 2759456eb4 [formerly 8a0e996d66b57d071870b907bcf224310d4b10c8]]
Former-commit-id: 5e72b8fa2e
Former-commit-id: 323d9f40da
This commit is contained in:
Benjamin Phillippe 2013-10-02 09:58:55 -05:00
parent 9d07c6428b
commit b25530ea61
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.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.util.CollectionUtil;
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
* 9/20/2013 2385 bphillip Added subscription backup functions
* 10/2/2013 2385 bphillip Fixed subscription backup queries
* </pre>
*
* @author bphillip
@ -76,7 +78,14 @@ public class RegistryDataAccessService implements IRegistryDataAccessService {
System.getProperty("edex.home")
+ "/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 */
private RegistryObjectDao registryObjectDao;
@ -191,12 +200,14 @@ public class RegistryDataAccessService implements IRegistryDataAccessService {
@PathParam("subscriptionName") String subscriptionName)
throws JAXBException {
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)
.append("] not found in registry");
} else {
RegistryObjectType sub = result.get(0);
if (!SUBSCRIPTION_BACKUP_DIR.exists()) {
SUBSCRIPTION_BACKUP_DIR.mkdirs();
}