stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ud...@apache.org
Subject [01/10] git commit: moving registry type retrive to constructer. So no need to retrive it everytime
Date Tue, 07 Oct 2014 12:18:03 GMT
Repository: stratos
Updated Branches:
  refs/heads/4.0.0-grouping 7778756ad -> 4bd661ede


moving registry type retrive to constructer. So no need to retrive it everytime


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/45caaf71
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/45caaf71
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/45caaf71

Branch: refs/heads/4.0.0-grouping
Commit: 45caaf71f4a901333568e657ce1cba956dcec7a7
Parents: 07eeac3
Author: Udara Liyanage <udara@wso2.com>
Authored: Thu Oct 2 10:02:33 2014 +0530
Committer: Udara Liyanage <udara@wso2.com>
Committed: Thu Oct 2 10:02:33 2014 +0530

----------------------------------------------------------------------
 .../metadataservice/services/MetaDataAdmin.java | 53 ++++----------------
 1 file changed, 9 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/45caaf71/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
index 439cc0b..b20f7b3 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
@@ -30,12 +30,17 @@ public class MetaDataAdmin {
 	private final String defaultRegType = "carbon";
 
 	private XMLConfiguration conf;
+    private String registryType;
 
+    public MetaDataAdmin(){
+        conf = ConfUtil.getInstance(null).getConfiguration();
+        registryType =  conf.getString("metadataservice.govenanceregistrytype", defaultRegType);
+    }
 	@POST
 	@Path("/init")
 	@AuthorizationAction("/permission/protected/manage/monitor/tenants")
 	public void initialize() throws RestAPIException {
-		conf = ConfUtil.getInstance(null).getConfiguration();
+
 	}
 
     public boolean removeCartridgeMetaDataDetails(String applicationName, String cartridgeType)
@@ -55,11 +60,7 @@ public class MetaDataAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public Response getClusterProperties(@PathParam("application_id") String applicationId,
@PathParam("cluster_id") String clusterId){
-        conf = ConfUtil.getInstance(null).getConfiguration();
 
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
         List<NewProperty> properties;
         NewProperty[] propertiesArr = null;
         try {
@@ -88,10 +89,6 @@ public class MetaDataAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public Response getClusterProperty(@PathParam("application_id") String applicationId,
@PathParam("cluster_id") String clusterId, @PathParam("property_name") String propertyName){
-        conf = ConfUtil.getInstance(null).getConfiguration();
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
         List<NewProperty> properties = null;
         NewProperty property = null;
 
@@ -126,11 +123,7 @@ public class MetaDataAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public Response getClusterDependencies(@PathParam("application_id") String applicationId,
@PathParam("cluster_id") String clusterId){
-        conf = ConfUtil.getInstance(null).getConfiguration();
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
-        List<NewProperty> properties = null;
+        List<NewProperty> properties;
         NewProperty property = null;
 
         try {
@@ -163,12 +156,7 @@ public class MetaDataAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public Response getApplicationProperties(@PathParam("application_id") String applicationId){
-        conf = ConfUtil.getInstance(null).getConfiguration();
-
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
-        List<NewProperty> properties = null;
+        List<NewProperty> properties;
         NewProperty[] propertiesArr = null;
         try {
             properties = DataRegistryFactory.getDataRegistryFactory(registryType)
@@ -196,11 +184,7 @@ public class MetaDataAdmin {
     @Consumes("application/json")
     @AuthorizationAction("/permission/protected/manage/monitor/tenants")
     public Response getApplicationProperty(@PathParam("application_id") String applicationId,
@PathParam("property_name") String propertyName){
-        conf = ConfUtil.getInstance(null).getConfiguration();
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
-        List<NewProperty> properties = null;
+        List<NewProperty> properties;
         NewProperty property = null;
 
         try {
@@ -240,9 +224,7 @@ public class MetaDataAdmin {
             throw new RestAPIException("Property name should be dependencies");
         }
         URI url =  uriInfo.getAbsolutePathBuilder().path(applicationId + "/" + clusterId
+ "/" + property.getKey()).build();
-        conf = ConfUtil.getInstance(null).getConfiguration();
 
-        String registryType = conf.getString("metadataservice.govenanceregistrytype", defaultRegType);
         try {
             DataRegistryFactory.getDataRegistryFactory(registryType).addPropertyToCluster(applicationId,
clusterId, property);
         } catch (RegistryException e) {
@@ -260,9 +242,7 @@ public class MetaDataAdmin {
             throws RestAPIException {
 
         URI url =  uriInfo.getAbsolutePathBuilder().path(applicationId + "/" + clusterId
+ "/" + property.getKey()).build();
-        conf = ConfUtil.getInstance(null).getConfiguration();
 
-        String registryType = conf.getString("metadataservice.govenanceregistrytype", defaultRegType);
         try {
             DataRegistryFactory.getDataRegistryFactory(registryType).addPropertyToCluster(applicationId,
clusterId, property);
         } catch (RegistryException e) {
@@ -282,11 +262,6 @@ public class MetaDataAdmin {
             throws RestAPIException {
         URI url =  uriInfo.getAbsolutePathBuilder().path(applicationId + "/" + clusterId).build();
 
-        conf = ConfUtil.getInstance(null).getConfiguration();
-
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
         try {
             DataRegistryFactory.getDataRegistryFactory(registryType).addPropertiesToCluster(applicationId,
clusterId, properties);
         } catch (Exception e) {
@@ -306,11 +281,6 @@ public class MetaDataAdmin {
             throws RestAPIException {
         URI url =  uriInfo.getAbsolutePathBuilder().path(applicationId).build();
 
-        conf = ConfUtil.getInstance(null).getConfiguration();
-
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
         try {
             DataRegistryFactory.getDataRegistryFactory(registryType).addPropertiesToApplication(applicationId,
properties);
         } catch (Exception e) {
@@ -330,11 +300,6 @@ public class MetaDataAdmin {
             throws RestAPIException {
         URI url =  uriInfo.getAbsolutePathBuilder().path(applicationId).build();
 
-        conf = ConfUtil.getInstance(null).getConfiguration();
-
-        String registryType =
-                conf.getString("metadataservice.govenanceregistrytype",
-                        defaultRegType);
         try {
             DataRegistryFactory.getDataRegistryFactory(registryType).addPropertyToApplication(applicationId,
property);
         } catch (Exception e) {


Mime
View raw message