SAK-32735 use appropriate isNotBlank or isBlank method (sakaiproject#…

…4642) * SAK-32735 use appropriate isNotBlank or isBlank method * SAK-32735 one more unnecessary null
thakursir · Aug 1, 2017 · 0b4cf31 · 0b4cf31
1 parent 0a378dc
commit 0b4cf31
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/...src/java/org/sakaiproject/announcement/entityprovider/AnnouncementEntityProviderImpl.java b/...src/java/org/sakaiproject/announcement/entityprovider/AnnouncementEntityProviderImpl.java
@@ -504,7 +504,7 @@ public List<?> getAnnouncementsForSite(EntityView view, Map<String, Object> para
 
 		//check if logged in
 		String currentUserId = sessionManager.getCurrentSessionUserId();
-		boolean isLoggedIn = !StringUtils.isBlank(currentUserId);
+		boolean isLoggedIn = StringUtils.isNotBlank(currentUserId);
 		boolean canReadThemAnyway = securityService.unlock(AnnouncementService.SECURE_ANNC_READ, siteService.siteReference(siteId));
 
 		if (isLoggedIn || canReadThemAnyway) {

diff --git a/basiclti/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java b/basiclti/basiclti-portlet/src/java/org/sakaiproject/blti/ProviderServlet.java
@@ -957,7 +957,7 @@ private void syncSiteMembershipsOnceThenSchedule(Map payload, Site site, boolean
 
         final String membershipsUrl = (String) payload.get("ext_ims_lis_memberships_url");
 
-        if (!BasicLTIUtil.isNotBlank(membershipsUrl)) {
+        if (BasicLTIUtil.isBlank(membershipsUrl)) {
             M_log.info("LTI Memberships extension is not supported.");
             return;
         }
@@ -966,7 +966,7 @@ private void syncSiteMembershipsOnceThenSchedule(Map payload, Site site, boolean
 
         final String membershipsId = (String) payload.get("ext_ims_lis_memberships_id");
 
-        if (!BasicLTIUtil.isNotBlank(membershipsId)) {
+        if (BasicLTIUtil.isBlank(membershipsId)) {
             M_log.info("No memberships id supplied. Memberships will NOT be synchronized.");
             return;
         }

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.java
@@ -72,7 +72,7 @@ public void onInitialize() {
 		final List<GbUser> teachingAssistants = this.businessService.getTeachingAssistants();
 
 		// get the TA GbUser for selected (if provided)
-		if (!StringUtils.isBlank(taUuid)) {
+		if (StringUtils.isNotBlank(taUuid)) {
 			for (final GbUser gbUser : teachingAssistants) {
 				if (taUuid.equals(gbUser.getUserUuid())) {
 					this.taSelected = gbUser;

diff --git a/.../kernel-impl/src/main/java/org/sakaiproject/component/impl/BasicConfigurationService.java b/.../kernel-impl/src/main/java/org/sakaiproject/component/impl/BasicConfigurationService.java
@@ -522,7 +522,7 @@ protected String dereferenceValue(String value) {
                 int pointer = 0;
                 while (matcher.find()) {
                     String name = matcher.group(1);
-                    if (name != null && StringUtils.isNotBlank(name)) {
+                    if (StringUtils.isNotBlank(name)) {
                         // look up the value
                         String replacementValue = null;
                         ConfigItemImpl ci = findConfigItem(name, null);

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/component/impl/ConfigItemImpl.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/component/impl/ConfigItemImpl.java
@@ -161,7 +161,7 @@ public void merge(ConfigItem ci) {
             this.value = ci.getValue();
             this.type = setValue(ci.getValue());
             this.description = ci.getDescription();
-            if (!StringUtils.isBlank(ci.getSource())) {
+            if (StringUtils.isNotBlank(ci.getSource())) {
                 this.source = ci.getSource();
             }
             this.defaultValue = ci.getDefaultValue();

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/HtmlPageFilter.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/HtmlPageFilter.java
@@ -169,7 +169,7 @@ private boolean isMathJaxEnabled(Entity entity) {
 			if (entity instanceof Site) {
 				Site site = (Site)entity;
 				String strMathJaxEnabled = site.getProperties().getProperty(MATHJAX_ENABLED);
-				if (!StringUtils.isBlank(strMathJaxEnabled))
+				if (StringUtils.isNotBlank(strMathJaxEnabled))
 				{
 					String[] mathJaxTools = strMathJaxEnabled.split(",");
 					if (ArrayUtils.contains(mathJaxTools, "sakai.resources"))

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/JoinSiteDelegate.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/JoinSiteDelegate.java
@@ -215,7 +215,7 @@ public boolean isAllowedToJoin(Site site)
      */
 	public boolean isLimitByAccountTypeEnabled(String siteID)
 	{
-		if(siteID == null || StringUtils.isBlank(siteID))
+		if(StringUtils.isBlank(siteID))
 		{
 			return false;
 		}

diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
@@ -1309,7 +1309,7 @@ public Properties toolHeaderProperties(HttpServletRequest req, String skin, Site
                 if (site != null)
                 {                           
                     String strMathJaxEnabledForSite = site.getProperties().getProperty(MATHJAX_ENABLED);
-                    if (!StringUtils.isBlank(strMathJaxEnabledForSite))
+                    if (StringUtils.isNotBlank(strMathJaxEnabledForSite))
                     {
                         if (Boolean.valueOf(strMathJaxEnabledForSite))
                         {

diff --git a/...ortal-service-impl/impl/src/java/org/sakaiproject/portal/service/BullhornServiceImpl.java b/...ortal-service-impl/impl/src/java/org/sakaiproject/portal/service/BullhornServiceImpl.java
@@ -545,7 +545,7 @@ public Object readSqlResultRecord(ResultSet rs) {
             try {
                 User fromUser = userDirectoryService.getUser(alert.from);
                 alert.fromDisplayName = fromUser.getDisplayName();
-                if (!StringUtils.isBlank(alert.siteId)) {
+                if (StringUtils.isNotBlank(alert.siteId)) {
                     alert.siteTitle = siteService.getSite(alert.siteId).getTitle();
                 }
             } catch (UserNotDefinedException unde) {

diff --git a/portal/portal-tool/tool/src/java/org/sakaiproject/portal/tool/ToolPortal.java b/portal/portal-tool/tool/src/java/org/sakaiproject/portal/tool/ToolPortal.java
@@ -307,7 +307,7 @@ protected void setupForward(HttpServletRequest req, HttpServletResponse res,
                 if (site != null)
                 {                           
                     String strMathJaxEnabledForSite = site.getProperties().getProperty(MATHJAX_ENABLED);
-                    if (!StringUtils.isBlank(strMathJaxEnabledForSite))
+                    if (StringUtils.isNotBlank(strMathJaxEnabledForSite))
                     {
                         if (Boolean.valueOf(strMathJaxEnabledForSite))
                         {

diff --git a/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java b/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java
@@ -757,7 +757,7 @@ public void processActionEdit(ActionRequest request, ActionResponse response)
             }
 
             // If we have a URL from the user, lets validate it
-            if ((!StringUtils.isBlank(source)) && (!validateURL(source)) ) {
+            if ((StringUtils.isNotBlank(source)) && (!validateURL(source)) ) {
                 addAlert(request, rb.getString("gen.url.invalid"));
                 return;
             }
@@ -775,7 +775,7 @@ public void processActionEdit(ActionRequest request, ActionResponse response)
             }
 
             // If we have an infourl from the user, lets validate it
-            if ((!StringUtils.isBlank(infoUrl)) && (!validateURL(infoUrl)) ) {
+            if ((StringUtils.isNotBlank(infoUrl)) && (!validateURL(infoUrl)) ) {
                 addAlert(request, rb.getString("gen.url.invalid"));
                 return;
             }