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

[DS-2729] Ensure SiteService extends DSpaceObjectService

Browse Source
This commit is contained in:
KevinVdV
2015-08-28 14:07:09 +02:00
parent 2467f43ec7
commit 74e14c570f
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dspace-api/src/main/java/org/dspace/content/Site.java
View File

@@ -7,11 +7,14 @@
*/
package org.dspace.content;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.SiteService;
import org.dspace.core.ConfigurationManager;
import org.dspace.core.Constants;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* Represents the root of the DSpace Archive.
@@ -22,6 +25,9 @@ import javax.persistence.Table;
public class Site extends DSpaceObject
{
@Transient
private SiteService siteService;
/**
* Get the type of this object, found in Constants
*
@@ -36,11 +42,20 @@ public class Site extends DSpaceObject
@Override
public String getName()
{
return ConfigurationManager.getProperty("dspace.name");
return getSiteService().getName(this);
}
public String getURL()
{
return ConfigurationManager.getProperty("dspace.url");
}
private SiteService getSiteService() {
if(siteService == null)
{
siteService = ContentServiceFactory.getInstance().getSiteService();
}
return siteService;
}
}

21
dspace-api/src/main/java/org/dspace/content/SiteServiceImpl.java
View File

@@ -11,8 +11,10 @@ import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.dao.SiteDAO;
import org.dspace.content.service.SiteService;
import org.dspace.core.ConfigurationManager;
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.event.Event;
import org.dspace.handle.service.HandleService;
import org.dspace.services.ConfigurationService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,12 +72,27 @@ public class SiteServiceImpl extends DSpaceObjectServiceImpl<Site> implements Si
}
@Override
public void update(Context context, Site dso) throws SQLException, AuthorizeException {
public void update(Context context, Site site) throws SQLException, AuthorizeException {
if(!authorizeService.isAdmin(context)){
throw new AuthorizeException();
}
siteDAO.save(context, dso);
if(site.isMetadataModified())
{
context.addEvent(new Event(Event.MODIFY_METADATA, site.getType(), site.getID(), site.getDetails(), getIdentifiers(context, site)));
}
if(site.isModified()) {
context.addEvent(new Event(Event.MODIFY, site.getType(), site.getID(), site.getDetails(), getIdentifiers(context, site)));
}
site.clearModified();
site.clearDetails();
siteDAO.save(context, site);
}
@Override
public String getName(Site dso)
{
return ConfigurationManager.getProperty("dspace.name");
}
@Override

1
dspace-api/src/test/java/org/dspace/content/SiteTest.java
View File

@@ -134,6 +134,7 @@ public class SiteTest extends AbstractUnitTest
public void testGetName()
{
assertThat("testGetName 0",s.getName(), equalTo(ConfigurationManager.getProperty("dspace.name")));
assertThat("testGetName 1",siteService.getName(s), equalTo(ConfigurationManager.getProperty("dspace.name")));
}