refactoring code java 8 streams api

balaji-s · balaji-s · commit 02fb4f07e256 · 2020-06-12T00:15:55.000+05:30
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
@@ -534,9 +534,6 @@ public static final Map<AminoAcidCompound, Double> getAAComposition(String seque
 	public static final Map<String, Double> getAACompositionString(String sequence){
 		Map<AminoAcidCompound, Double> aa2Composition = getAAComposition(sequence);
 		Map<String, Double> aaString2Composition = new HashMap<String, Double>();
-		for(AminoAcidCompound aaCompound:aa2Composition.keySet()){
-			aaString2Composition.put(aaCompound.getShortName(), aa2Composition.get(aaCompound));
-		}
 		aaString2Composition = aa2Composition.keySet()
 																							.stream()
 																							.collect(Collectors.toMap(aaCompound -> aaCompound.getShortName(),
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 
 /**
@@ -247,9 +248,7 @@ public static Range[] scoresToRanges(float[] scores, float probability)  {
 	 */
 	public static Map<FastaSequence,float[]> getDisorderScores(List<FastaSequence> sequences) {
 		Map<FastaSequence,float[]> results = new TreeMap<FastaSequence, float[]>();
-		for(FastaSequence fsequence : sequences) {
-			results.put(fsequence, predictSerial(fsequence));
-		}
+		results = sequences.stream().collect(Collectors.toMap(sequence ->  sequence, sequence -> predictSerial(sequence)));
 		return results;
 	}
 
@@ -262,6 +261,8 @@ public static Map<FastaSequence,float[]> getDisorderScores(List<FastaSequence> s
 	 */
 	public static Map<FastaSequence,Range[]> getDisorder(List<FastaSequence> sequences) {
 		Map<FastaSequence,Range[]> disorderRanges = new TreeMap<FastaSequence,Range[]>();
+		disorderRanges = sequences.stream()
+															.collect(Collectors.toMap(sequence -> sequence, sequence -> getDisorder(sequence) ));
 		for(FastaSequence fs: sequences) {
 			disorderRanges.put(fs, getDisorder(fs));
 		}
