Merge pull request #2000 from mavrk/TRUNK-5039

TRUNK-5039 Remove redundant null checks
openmrs · Feb 16, 2017 · 69e4a4e · 69e4a4e
2 parents 163bb19 + b52c988
commit 69e4a4e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 27 deletions.
diff --git a/api/src/main/java/org/openmrs/Cohort.java b/api/src/main/java/org/openmrs/Cohort.java
@@ -216,7 +216,7 @@ public void purgeMemberships(List<CohortMembership> cohortMembershipList) {
 
 
 	public int size() {
-		return getMembers() == null ? 0 : getMembers().size();
+		return getMembers().size();
 	}
 
 	public int getSize() {

diff --git a/api/src/main/java/org/openmrs/Concept.java b/api/src/main/java/org/openmrs/Concept.java
@@ -1241,15 +1241,9 @@ public void setDescriptions(Collection<ConceptDescription> descriptions) {
 	 * @param description the description to add
 	 */
 	public void addDescription(ConceptDescription description) {
-		if (description != null && StringUtils.isNotBlank(description.getDescription())) {
-			if (getDescriptions() == null) {
-				descriptions = new HashSet<ConceptDescription>();
-				description.setConcept(this);
-				descriptions.add(description);
-			} else if (!descriptions.contains(description)) {
-				description.setConcept(this);
-				descriptions.add(description);
-			}
+		if (description != null && StringUtils.isNotBlank(description.getDescription()) && !descriptions.contains(description)) {
+			description.setConcept(this);
+			descriptions.add(description);
 		}
 	}
 
@@ -1261,11 +1255,7 @@ public void addDescription(ConceptDescription description) {
 	 * @Should should remove description passed from list of descriptions
 	 */
 	public boolean removeDescription(ConceptDescription description) {
-		if (getDescriptions() != null) {
-			return descriptions.remove(description);
-		} else {
-			return false;
-		}
+		return descriptions.remove(description);
 	}
 
 	/**

diff --git a/api/src/main/java/org/openmrs/module/ModuleFactory.java b/api/src/main/java/org/openmrs/module/ModuleFactory.java
@@ -1204,10 +1204,6 @@ public static List<Module> stopModule(Module mod, boolean skipOverStartedPropert
 						String extId = ext.getExtensionId();
 						try {
 							List<Extension> tmpExtensions = getExtensions(extId);
-							if (tmpExtensions == null) {
-								tmpExtensions = new Vector<Extension>();
-							}
-
 							tmpExtensions.remove(ext);
 							getExtensionMap().put(extId, tmpExtensions);
 						}

diff --git a/web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java b/web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
@@ -1582,10 +1582,6 @@ public void executing(ChangeSet changeSet, int numChangeSetsToRun) {
 									InputStream inData = TestInstallUtil.getResourceInputStream(wizardModel.remoteUrl
 									        + RELEASE_TESTING_MODULE_PATH + "generateTestDataSet.form",
 									    wizardModel.remoteUsername, wizardModel.remotePassword);
-									if (inData == null) {
-										reportError(ErrorMessageConstants.ERROR_DB_IMPORT_TEST_DATA, DEFAULT_PAGE, "");
-										return;
-									}
 
 									setCompletedPercentage(40);
 									setMessage("Loading imported test data...");
@@ -1602,10 +1598,6 @@ public void executing(ChangeSet changeSet, int numChangeSetsToRun) {
 									InputStream inModules = TestInstallUtil.getResourceInputStream(wizardModel.remoteUrl
 									        + RELEASE_TESTING_MODULE_PATH + "getModules.htm", wizardModel.remoteUsername,
 									    wizardModel.remotePassword);
-									if (inModules == null) {
-										reportError(ErrorMessageConstants.ERROR_DB_UNABLE_TO_FETCH_MODULES, DEFAULT_PAGE, "");
-										return;
-									}
 
 									setCompletedPercentage(90);
 									setMessage("Adding imported modules...");