TenantRollback tenantRollback = new TenantRollback ();
 
                try {
-                       Holder<String> htenant = new Holder<String>();
-                       Holder<TenantRollback> hrollback = new Holder<TenantRollback>();
+                       Holder<String> htenant = new Holder<>();
+                       Holder<TenantRollback> hrollback = new Holder<>();
                        MsoTenantAdapter impl = new MsoTenantAdapterImpl();
                    impl.createTenant(
                        req.getCloudSiteId(),
                boolean tenantDeleted = false;
 
                try {
-                       Holder<Boolean> deleted = new Holder<Boolean>();
+                       Holder<Boolean> deleted = new Holder<>();
                        MsoTenantAdapter impl = new MsoTenantAdapterImpl();
                    impl.deleteTenant(
                        req.getCloudSiteId(),
        {
                MsoTenant tenant = null;
                try {
-                       Holder<String> htenant = new Holder<String>();
-                       Holder<String> tenantName = new Holder<String>();
-                       Holder<Map<String,String>> metadata = new Holder<Map<String,String>>();
+                       Holder<String> htenant = new Holder<>();
+                       Holder<String> tenantName = new Holder<>();
+                       Holder<Map<String,String>> metadata = new Holder<>();
                        MsoTenantAdapter impl = new MsoTenantAdapterImpl();
                    impl.queryTenant(
                        cloudSiteId,