Refactor

2 files changed, 6 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java
index 0d104a97698..43cc2fad285 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java
@@ -316,18 +316,18 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
                     } catch (ParseException e) {
                         throw new IllegalArgumentException("Could not parse second phase expression", e);
                     }
-                    continue;
                 }
-                if ("rankingExpression(secondphase).rankingScript".equals(property.getName())) {
+                else if ("rankingExpression(secondphase).rankingScript".equals(property.getName())) {
                     try {
                         secondPhaseRanking = new RankingExpression(property.getValue());
                     } catch (ParseException e) {
                         throw new IllegalArgumentException("Could not parse second phase expression", e);
                     }
-                    continue;
                 }
-                properties.put(property.getName() + ".part" + i, property.getValue());
-                i++;
+                else {
+                    properties.put(property.getName() + ".part" + i, property.getValue());
+                    i++;
+                }
             }
             properties.putAll(deriveRankingPhaseRankProperties(firstPhaseRanking, "firstphase"));
             properties.putAll(deriveRankingPhaseRankProperties(secondPhaseRanking, "secondphase"));
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java
index 9abaaca84a3..40c3b997daa 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java
@@ -21,7 +21,7 @@ public class RankProfileTransformContext extends TransformContext {
     private final QueryProfileRegistry queryProfiles;
     private final ImportedModels importedModels;
     private final Map<String, RankProfile.Macro> inlineMacros;
-    private final Map<String, String> rankProperties = new HashMap<String, String>();
+    private final Map<String, String> rankProperties = new HashMap<>();
 
     public RankProfileTransformContext(RankProfile rankProfile,
                                        QueryProfileRegistry queryProfiles,