Issue #130 refactoring: serving static content

Sunbird-RC · Mar 28, 2018 · 91394b0 · 91394b0
1 parent 4d4dc2e
commit 91394b0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3,024 deletions.
diff --git a/java/registry/src/main/java/io/opensaber/registry/config/GenericConfiguration.java b/java/registry/src/main/java/io/opensaber/registry/config/GenericConfiguration.java
@@ -54,9 +54,6 @@ public class GenericConfiguration implements WebMvcConfigurer {
 	@Autowired
 	private Environment environment;
 
-	@Value("${vocab.fileName}")
-	private String vocabFileName;
-
 	@Value("${connection.timeout}")
 	private int connectionTimeout;
 
@@ -159,19 +156,12 @@ public void addInterceptors(InterceptorRegistry registry) {
 	}
 
 	@Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    	String resourcePath=null;
-    	try {
-    		resourcePath=this.getClass().getClassLoader().getResource(vocabFileName).toURI().toString();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-			logger.error("ERROR!", e);
-		}
-        registry.addResourceHandler("/resources/**")
-            .addResourceLocations(resourcePath)
-            .setCachePeriod(3600)
-            .resourceChain(true)
-            .addResolver(new PathResourceResolver());
-    }
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		registry.addResourceHandler("/resources/**")
+		.addResourceLocations("classpath:/BOOT-INF/classes/vocabulary/")
+		.setCachePeriod(3600)
+		.resourceChain(true)
+		.addResolver(new PathResourceResolver());
+	}
 
 }
diff --git a/java/registry/src/main/java/io/opensaber/registry/controller/RegistryController.java b/java/registry/src/main/java/io/opensaber/registry/controller/RegistryController.java
@@ -40,9 +40,7 @@ public class RegistryController {
 	@Value("${registry.context.base}")
 	private String registryContext;
 
-	@Value("${vocab.fileName}")
-	private String vocabFileName;
-
+
 	@ResponseBody
 	@RequestMapping(value = "/create", method = RequestMethod.POST)
 	public ResponseEntity<Response> addEntity(@RequestAttribute Request requestModel) {

diff --git a/java/registry/src/main/resources/config-prod.properties.sample b/java/registry/src/main/resources/config-prod.properties.sample
@@ -64,7 +64,3 @@ encryption.uri= ${encryption.decryption.base}encrypt
 decryption.uri= ${encryption.decryption.base}decrypt
 sunbird.encryption-service.health.check=https://dev.open-sunbird.org/encryption/
 
-##############################################################
-#         			    Vocab file Config           	    #
-##############################################################
-vocab.fileName=teacher.owl
diff --git a/java/registry/src/main/resources/config-test.properties.sample b/java/registry/src/main/resources/config-test.properties.sample
@@ -16,8 +16,3 @@ encryption.decryption.base=https://dev.open-sunbird.org/encryption/
 encryption.uri= ${encryption.decryption.base}encrypt
 decryption.uri= ${encryption.decryption.base}decrypt
 sunbird.encryption-service.health.check=https://test-enc-service-health-check.com/encryption/
-
-##############################################################
-#         			    Vocab file Config           	    #
-##############################################################
-vocab.fileName=teacher.owl