[GITFLOW]merging 'release-0.9.1' into 'master'

SORMAS-Foundation · Nov 21, 2017 · 98ada74 · 98ada74
2 parents 6d6af0e + 42490eb
commit 98ada74
Show file tree

Hide file tree

Showing 30 changed files with 49 additions and 67 deletions.
diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>0.9.0</version>
+		<version>0.9.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>sormas-base</artifactId>
 		<groupId>de.symeda.sormas</groupId>
-		<version>0.9.0</version>
+		<version>0.9.1</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sormas-base</artifactId>
         <groupId>de.symeda.sormas</groupId>
-        <version>0.9.0</version>
+        <version>0.9.1</version>
         <relativePath>../sormas-base</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java
@@ -10,7 +10,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.criteria.CriteriaBuilder;
@@ -606,7 +605,6 @@ public Map<RegionReferenceDto, Long> getCaseCountPerRegion(Date fromDate, Date t
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class CaseFacadeEjbLocal extends CaseFacadeEjb {
 	}
 

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java
@@ -13,7 +13,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 import javax.validation.ValidationException;
 import javax.validation.constraints.NotNull;
 
@@ -425,7 +424,6 @@ public void generateContactFollowUpTasks() {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class ContactFacadeEjbLocal extends ContactFacadeEjb {
 	}
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java
@@ -8,7 +8,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 
 import de.symeda.sormas.api.epidata.EpiDataBurialDto;
 import de.symeda.sormas.api.epidata.EpiDataDto;
@@ -337,7 +336,6 @@ public static EpiDataTravelDto toDto(EpiDataTravel travel) {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class EpiDataFacadeEjbLocal extends EpiDataFacadeEjb {
 	}
 

diff --git a/...kend/src/main/java/de/symeda/sormas/backend/hospitalization/HospitalizationFacadeEjb.java b/...kend/src/main/java/de/symeda/sormas/backend/hospitalization/HospitalizationFacadeEjb.java
@@ -8,7 +8,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 
 import de.symeda.sormas.api.hospitalization.HospitalizationDto;
 import de.symeda.sormas.api.hospitalization.HospitalizationFacade;
@@ -179,7 +178,6 @@ public static PreviousHospitalizationDto toDto(PreviousHospitalization hospitali
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class HospitalizationFacadeEjbLocal extends HospitalizationFacadeEjb {
 	}
 

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/location/LocationFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/location/LocationFacadeEjb.java
@@ -5,7 +5,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 
 import de.symeda.sormas.api.location.LocationDto;
 import de.symeda.sormas.api.location.LocationFacade;
@@ -86,7 +85,6 @@ public static LocationDto toDto(Location source) {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class LocationFacadeEjbLocal extends LocationFacadeEjb {
 	}
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java
@@ -12,7 +12,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.Disease;
@@ -321,7 +320,6 @@ public static PersonDto toDto(Person source) {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class PersonFacadeEjbLocal extends PersonFacadeEjb {
 	}
 

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/region/DistrictFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/region/DistrictFacadeEjb.java
@@ -7,7 +7,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 
 import de.symeda.sormas.api.region.DistrictDto;
 import de.symeda.sormas.api.region.DistrictFacade;
@@ -81,7 +80,6 @@ private DistrictDto toDto(District entity) {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class DistrictFacadeEjbLocal extends DistrictFacadeEjb	 {
 	}
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/region/GeoShapeProviderEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/region/GeoShapeProviderEjb.java
@@ -1,6 +1,6 @@
 package de.symeda.sormas.backend.region;
 
-import java.io.File;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -125,13 +125,13 @@ private void loadRegionData() {
 		// load shapefile
 		String countryName = configService.getCountryName();
 		String filepath = "shapefiles/" + countryName + "/regions.shp";
-		File file = new File(getClass().getClassLoader().getResource(filepath).getFile());
-		if (!file.exists() || !filepath.endsWith(".shp")) {
+		URL filepathUrl = getClass().getClassLoader().getResource(filepath);
+		if (filepathUrl == null || !filepath.endsWith(".shp")) {
 			throw new RuntimeException("Invalid shapefile filepath: " + filepath);
 		}
 
 		try {
-			ShapefileDataStore dataStore = new ShapefileDataStore(file.toURI().toURL());
+			ShapefileDataStore dataStore = new ShapefileDataStore(filepathUrl);
 			ContentFeatureSource featureSource = dataStore.getFeatureSource();
 			ContentFeatureCollection featureCollection = featureSource.getFeatures();
 
@@ -207,13 +207,13 @@ private void loadDistrictData() {
 		// load shapefile
 		String countryName = configService.getCountryName();
 		String filepath = "shapefiles/" + countryName + "/districts.shp";
-		File file = new File(getClass().getClassLoader().getResource(filepath).getFile());
-		if (!file.exists() || !filepath.endsWith(".shp")) {
+		URL filepathUrl = getClass().getClassLoader().getResource(filepath);
+		if (filepathUrl == null || !filepath.endsWith(".shp")) {
 			throw new RuntimeException("Invalid shapefile filepath: " + filepath);
 		}
 
 		try {
-			ShapefileDataStore dataStore = new ShapefileDataStore(file.toURI().toURL());
+			ShapefileDataStore dataStore = new ShapefileDataStore(filepathUrl);
 			ContentFeatureSource featureSource = dataStore.getFeatureSource();
 			ContentFeatureCollection featureCollection = featureSource.getFeatures();
 

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/region/RegionFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/region/RegionFacadeEjb.java
@@ -7,7 +7,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 
 import de.symeda.sormas.api.region.RegionDataDto;
 import de.symeda.sormas.api.region.RegionDto;
@@ -95,7 +94,6 @@ private RegionDataDto toDataDto(Region entity) {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class RegionFacadeEjbLocal extends RegionFacadeEjb	 {
 	}
 }
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/report/WeeklyReportFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/report/WeeklyReportFacadeEjb.java
@@ -11,7 +11,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.FacadeProvider;
@@ -287,7 +286,6 @@ public void generateSubmitWeeklyReportTasks() {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class WeeklyReportFacadeEjbLocal extends WeeklyReportFacadeEjb {
 	}
 

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/symptoms/SymptomsFacadeEjb.java
@@ -5,7 +5,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 
 import de.symeda.sormas.api.symptoms.SymptomsDto;
 import de.symeda.sormas.api.symptoms.SymptomsFacade;
@@ -241,7 +240,6 @@ public SymptomsDto saveSymptoms(SymptomsDto dto) {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class SymptomsFacadeEjbLocal extends SymptomsFacadeEjb {
 	}
 }

diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserFacadeEjb.java
@@ -8,7 +8,6 @@
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.enterprise.inject.Specializes;
 
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
@@ -212,7 +211,6 @@ public String resetPassword(String uuid) {
 
 	@LocalBean
 	@Stateless
-	@Specializes
 	public static class UserFacadeEjbLocal extends UserFacadeEjb {
 	}
 }
diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/caze/CaseFacadeEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/caze/CaseFacadeEjbTest.java
@@ -42,9 +42,9 @@
 import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal;
 import de.symeda.sormas.backend.region.CommunityFacadeEjb;
 import de.symeda.sormas.backend.region.CommunityService;
-import de.symeda.sormas.backend.region.DistrictFacadeEjb;
+import de.symeda.sormas.backend.region.DistrictFacadeEjb.DistrictFacadeEjbLocal;
 import de.symeda.sormas.backend.region.DistrictService;
-import de.symeda.sormas.backend.region.RegionFacadeEjb;
+import de.symeda.sormas.backend.region.RegionFacadeEjb.RegionFacadeEjbLocal;
 import de.symeda.sormas.backend.region.RegionService;
 import de.symeda.sormas.backend.report.WeeklyReportFacadeEjb.WeeklyReportFacadeEjbLocal;
 import de.symeda.sormas.backend.sample.SampleFacadeEjb;
@@ -174,8 +174,8 @@ private TestDataCreator createTestDataCreator() {
 		return new TestDataCreator(getBean(UserFacadeEjbLocal.class), getBean(PersonFacadeEjbLocal.class),
 				getBean(CaseFacadeEjbLocal.class), getBean(ContactFacadeEjbLocal.class), getBean(TaskFacadeEjb.class),
 				getBean(VisitFacadeEjb.class), getBean(WeeklyReportFacadeEjbLocal.class), getBean(EventFacadeEjb.class), 
-				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjb.class), 
-				getBean(DistrictFacadeEjb.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
+				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjbLocal.class), 
+				getBean(DistrictFacadeEjbLocal.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
 				getBean(RegionService.class), getBean(DistrictService.class), getBean(CommunityService.class), getBean(FacilityService.class));
 	}
 

diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/contact/ContactFacadeEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/contact/ContactFacadeEjbTest.java
@@ -42,9 +42,9 @@
 import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal;
 import de.symeda.sormas.backend.region.CommunityFacadeEjb;
 import de.symeda.sormas.backend.region.CommunityService;
-import de.symeda.sormas.backend.region.DistrictFacadeEjb;
+import de.symeda.sormas.backend.region.DistrictFacadeEjb.DistrictFacadeEjbLocal;
 import de.symeda.sormas.backend.region.DistrictService;
-import de.symeda.sormas.backend.region.RegionFacadeEjb;
+import de.symeda.sormas.backend.region.RegionFacadeEjb.RegionFacadeEjbLocal;
 import de.symeda.sormas.backend.region.RegionService;
 import de.symeda.sormas.backend.report.WeeklyReportFacadeEjb.WeeklyReportFacadeEjbLocal;
 import de.symeda.sormas.backend.sample.SampleFacadeEjb;
@@ -156,8 +156,8 @@ private TestDataCreator createTestDataCreator() {
 		return new TestDataCreator(getBean(UserFacadeEjbLocal.class), getBean(PersonFacadeEjbLocal.class),
 				getBean(CaseFacadeEjbLocal.class), getBean(ContactFacadeEjbLocal.class), getBean(TaskFacadeEjb.class),
 				getBean(VisitFacadeEjb.class), getBean(WeeklyReportFacadeEjbLocal.class), getBean(EventFacadeEjb.class), 
-				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjb.class), 
-				getBean(DistrictFacadeEjb.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
+				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjbLocal.class), 
+				getBean(DistrictFacadeEjbLocal.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
 				getBean(RegionService.class), getBean(DistrictService.class), getBean(CommunityService.class), getBean(FacilityService.class));
 	}
 

diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/event/EventFacadeEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/event/EventFacadeEjbTest.java
@@ -28,9 +28,9 @@
 import de.symeda.sormas.backend.person.PersonFacadeEjb.PersonFacadeEjbLocal;
 import de.symeda.sormas.backend.region.CommunityFacadeEjb;
 import de.symeda.sormas.backend.region.CommunityService;
-import de.symeda.sormas.backend.region.DistrictFacadeEjb;
+import de.symeda.sormas.backend.region.DistrictFacadeEjb.DistrictFacadeEjbLocal;
 import de.symeda.sormas.backend.region.DistrictService;
-import de.symeda.sormas.backend.region.RegionFacadeEjb;
+import de.symeda.sormas.backend.region.RegionFacadeEjb.RegionFacadeEjbLocal;
 import de.symeda.sormas.backend.region.RegionService;
 import de.symeda.sormas.backend.report.WeeklyReportFacadeEjb.WeeklyReportFacadeEjbLocal;
 import de.symeda.sormas.backend.sample.SampleFacadeEjb;
@@ -70,8 +70,8 @@ private TestDataCreator createTestDataCreator() {
 		return new TestDataCreator(getBean(UserFacadeEjbLocal.class), getBean(PersonFacadeEjbLocal.class),
 				getBean(CaseFacadeEjbLocal.class), getBean(ContactFacadeEjbLocal.class), getBean(TaskFacadeEjb.class),
 				getBean(VisitFacadeEjb.class), getBean(WeeklyReportFacadeEjbLocal.class), getBean(EventFacadeEjb.class), 
-				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjb.class), 
-				getBean(DistrictFacadeEjb.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
+				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjbLocal.class), 
+				getBean(DistrictFacadeEjbLocal.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
 				getBean(RegionService.class), getBean(DistrictService.class), getBean(CommunityService.class), getBean(FacilityService.class));
 	}
 }
diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/region/GeoShapeProviderEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/region/GeoShapeProviderEjbTest.java
@@ -12,10 +12,14 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import de.symeda.sormas.api.region.DistrictFacade;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.GeoLatLon;
+import de.symeda.sormas.api.region.RegionFacade;
 import de.symeda.sormas.api.region.RegionReferenceDto;
 import de.symeda.sormas.backend.common.ConfigService;
+import de.symeda.sormas.backend.region.DistrictFacadeEjb.DistrictFacadeEjbLocal;
+import de.symeda.sormas.backend.region.RegionFacadeEjb.RegionFacadeEjbLocal;
 import info.novatec.beantest.api.BeanProviderHelper;
 
 public class GeoShapeProviderEjbTest {
@@ -49,7 +53,7 @@ protected static <T> T getBean(Class<T> beanClass, Annotation... qualifiers) {
 	@Test
 	public void testGetRegionShape() throws Exception {
 		GeoShapeProviderEjb geoShapeProvider = getBean(GeoShapeProviderEjb.class);
-		RegionFacadeEjb regionFacade = getBean(RegionFacadeEjb.class);
+		RegionFacade regionFacade = getBean(RegionFacadeEjbLocal.class);
 
 		List<RegionReferenceDto> regions = regionFacade.getAllAsReference();
 		assertThat(regions.size(), greaterThan(1)); // make sure we have some regions
@@ -72,7 +76,7 @@ public void testGetDistrictShape() throws Exception {
 
 		RegionReferenceDto region = geoShapeProvider.getRegionByCoord(new GeoLatLon(9.076344, 7.276929));
 
-		DistrictFacadeEjb districtFacade = getBean(DistrictFacadeEjb.class);
+		DistrictFacade districtFacade = getBean(DistrictFacadeEjbLocal.class);
 		List<DistrictReferenceDto> districts = districtFacade.getAllByRegion(region.getUuid());
 		assertThat(districts.size(), greaterThan(1)); // make sure we have some districts
 

diff --git a/sormas-backend/src/test/java/de/symeda/sormas/backend/report/WeeklyReportFacadeEjbTest.java b/sormas-backend/src/test/java/de/symeda/sormas/backend/report/WeeklyReportFacadeEjbTest.java
@@ -29,9 +29,9 @@
 import de.symeda.sormas.backend.region.CommunityFacadeEjb;
 import de.symeda.sormas.backend.region.CommunityService;
 import de.symeda.sormas.backend.region.District;
-import de.symeda.sormas.backend.region.DistrictFacadeEjb;
+import de.symeda.sormas.backend.region.DistrictFacadeEjb.DistrictFacadeEjbLocal;
 import de.symeda.sormas.backend.region.DistrictService;
-import de.symeda.sormas.backend.region.RegionFacadeEjb;
+import de.symeda.sormas.backend.region.RegionFacadeEjb.RegionFacadeEjbLocal;
 import de.symeda.sormas.backend.region.RegionService;
 import de.symeda.sormas.backend.report.WeeklyReportFacadeEjb.WeeklyReportFacadeEjbLocal;
 import de.symeda.sormas.backend.sample.SampleFacadeEjb;
@@ -53,7 +53,7 @@ public void resetMocks() {
 
 	@Test
 	public void testShouldBuildDistrictSummaryDto() {
-		RegionFacade regionFacade = getBean(RegionFacadeEjb.class);
+		RegionFacade regionFacade = getBean(RegionFacadeEjbLocal.class);
 		WeeklyReportFacade reportFacade = getBean(WeeklyReportFacadeEjbLocal.class);
 
 		TestDataCreator creator = createTestDataCreator();
@@ -87,8 +87,8 @@ private TestDataCreator createTestDataCreator() {
 		return new TestDataCreator(getBean(UserFacadeEjbLocal.class), getBean(PersonFacadeEjbLocal.class),
 				getBean(CaseFacadeEjbLocal.class), getBean(ContactFacadeEjbLocal.class), getBean(TaskFacadeEjb.class),
 				getBean(VisitFacadeEjb.class), getBean(WeeklyReportFacadeEjbLocal.class), getBean(EventFacadeEjb.class), 
-				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjb.class), 
-				getBean(DistrictFacadeEjb.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
+				getBean(SampleFacadeEjb.class), getBean(SampleTestFacadeEjb.class), getBean(RegionFacadeEjbLocal.class), 
+				getBean(DistrictFacadeEjbLocal.class), getBean(CommunityFacadeEjb.class), getBean(FacilityFacadeEjb.class), 
 				getBean(RegionService.class), getBean(DistrictService.class), getBean(CommunityService.class), getBean(FacilityService.class));
 	}