홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
Committed by Gerrit Code Review
3da1a182 1 parent 2f11bb33

Fix incorrect method prerequisite checks in NetworkConfigManager. 

Change-Id: I460190952a4493544cf94dd0e2cec70ad1292ecb
Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
...@@ -56,7 +56,7 @@ public class NetworkConfigManager ...@@ -56,7 +56,7 @@ public class NetworkConfigManager
56 56
57 private static final String NULL_FACTORY_MSG = "Factory cannot be null"; 57 private static final String NULL_FACTORY_MSG = "Factory cannot be null";
58 private static final String NULL_SCLASS_MSG = "Subject class cannot be null"; 58 private static final String NULL_SCLASS_MSG = "Subject class cannot be null";
59 - private static final String NULL_SKEY_MSG = "Subject key cannot be null"; 59 + private static final String NULL_SCKEY_MSG = "Subject class key cannot be null";
60 private static final String NULL_CCLASS_MSG = "Config class cannot be null"; 60 private static final String NULL_CCLASS_MSG = "Config class cannot be null";
61 private static final String NULL_CKEY_MSG = "Config key cannot be null"; 61 private static final String NULL_CKEY_MSG = "Config key cannot be null";
62 private static final String NULL_SUBJECT_MSG = "Subject cannot be null"; 62 private static final String NULL_SUBJECT_MSG = "Subject cannot be null";
...@@ -159,7 +159,7 @@ public class NetworkConfigManager ...@@ -159,7 +159,7 @@ public class NetworkConfigManager
159 159
160 @Override 160 @Override
161 public Class<? extends Config> getConfigClass(String subjectClassKey, String configKey) { 161 public Class<? extends Config> getConfigClass(String subjectClassKey, String configKey) {
162 - checkNotNull(subjectClassKey, NULL_SKEY_MSG); 162 + checkNotNull(subjectClassKey, NULL_SCKEY_MSG);
163 checkNotNull(configKey, NULL_CKEY_MSG); 163 checkNotNull(configKey, NULL_CKEY_MSG);
164 return configClasses.get(new ConfigIdentifier(subjectClassKey, configKey)); 164 return configClasses.get(new ConfigIdentifier(subjectClassKey, configKey));
165 } 165 }
...@@ -205,7 +205,7 @@ public class NetworkConfigManager ...@@ -205,7 +205,7 @@ public class NetworkConfigManager
205 public <S, C extends Config<S>> C applyConfig(S subject, Class<C> configClass, JsonNode json) { 205 public <S, C extends Config<S>> C applyConfig(S subject, Class<C> configClass, JsonNode json) {
206 checkNotNull(subject, NULL_SUBJECT_MSG); 206 checkNotNull(subject, NULL_SUBJECT_MSG);
207 checkNotNull(configClass, NULL_CCLASS_MSG); 207 checkNotNull(configClass, NULL_CCLASS_MSG);
208 - checkNotNull(subject, NULL_JSON_MSG); 208 + checkNotNull(json, NULL_JSON_MSG);
209 return store.applyConfig(subject, configClass, json); 209 return store.applyConfig(subject, configClass, json);
210 } 210 }
211 211
...@@ -213,10 +213,10 @@ public class NetworkConfigManager ...@@ -213,10 +213,10 @@ public class NetworkConfigManager
213 @SuppressWarnings("unchecked") 213 @SuppressWarnings("unchecked")
214 public <S, C extends Config<S>> C applyConfig(String subjectClassKey, S subject, 214 public <S, C extends Config<S>> C applyConfig(String subjectClassKey, S subject,
215 String configKey, JsonNode json) { 215 String configKey, JsonNode json) {
216 - checkNotNull(subjectClassKey, NULL_SKEY_MSG); 216 + checkNotNull(subjectClassKey, NULL_SCKEY_MSG);
217 checkNotNull(subject, NULL_SUBJECT_MSG); 217 checkNotNull(subject, NULL_SUBJECT_MSG);
218 checkNotNull(configKey, NULL_CKEY_MSG); 218 checkNotNull(configKey, NULL_CKEY_MSG);
219 - checkNotNull(subject, NULL_JSON_MSG); 219 + checkNotNull(json, NULL_JSON_MSG);
220 Class<? extends Config> configClass = configClasses.get(new ConfigIdentifier(subjectClassKey, configKey)); 220 Class<? extends Config> configClass = configClasses.get(new ConfigIdentifier(subjectClassKey, configKey));
221 if (configClass != null) { 221 if (configClass != null) {
222 return store.applyConfig(subject, (Class<C>) configClass, json); 222 return store.applyConfig(subject, (Class<C>) configClass, json);
...@@ -236,9 +236,9 @@ public class NetworkConfigManager ...@@ -236,9 +236,9 @@ public class NetworkConfigManager
236 236
237 @Override 237 @Override
238 public <S> void removeConfig(String subjectClassKey, S subject, String configKey) { 238 public <S> void removeConfig(String subjectClassKey, S subject, String configKey) {
239 - checkNotNull(subjectClassKey, NULL_SKEY_MSG); 239 + checkNotNull(subjectClassKey, NULL_SCKEY_MSG);
240 checkNotNull(subject, NULL_SUBJECT_MSG); 240 checkNotNull(subject, NULL_SUBJECT_MSG);
241 - checkNotNull(configKey, NULL_CCLASS_MSG); 241 + checkNotNull(configKey, NULL_CKEY_MSG);
242 Class<? extends Config> configClass = configClasses.get(new ConfigIdentifier(subjectClassKey, configKey)); 242 Class<? extends Config> configClass = configClasses.get(new ConfigIdentifier(subjectClassKey, configKey));
243 if (configClass != null) { 243 if (configClass != null) {
244 store.clearConfig(subject, configClass); 244 store.clearConfig(subject, configClass);
......