Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add tests to increase code coverage
[nonrtric.git]
/
policy-agent
/
src
/
main
/
java
/
org
/
oransc
/
policyagent
/
tasks
/
RefreshConfigTask.java
diff --git
a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java
b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java
index
89c8d63
..
f44c8d5
100644
(file)
--- a/
policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java
+++ b/
policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java
@@
-22,8
+22,10
@@
package org.oransc.policyagent.tasks;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
+import com.google.gson.JsonIOException;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
import com.google.gson.TypeAdapterFactory;
import java.io.BufferedInputStream;
import com.google.gson.TypeAdapterFactory;
import java.io.BufferedInputStream;
@@
-69,8
+71,7
@@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/**
import reactor.core.publisher.Mono;
/**
- * Regularly refreshes the configuration from Consul or from a local
- * configuration file.
+ * Regularly refreshes the configuration from Consul or from a local configuration file.
*/
@Component
public class RefreshConfigTask {
*/
@Component
public class RefreshConfigTask {
@@
-158,8
+159,8
@@
public class RefreshConfigTask {
}
private Mono<JsonObject> getFromCbs(CbsClient cbsClient) {
}
private Mono<JsonObject> getFromCbs(CbsClient cbsClient) {
- final CbsRequest getConfigRequest = CbsRequests.getAll(RequestDiagnosticContext.create());
try {
try {
+ final CbsRequest getConfigRequest = CbsRequests.getAll(RequestDiagnosticContext.create());
return cbsClient.get(getConfigRequest) //
.onErrorResume(this::ignoreErrorMono);
} catch (Exception e) {
return cbsClient.get(getConfigRequest) //
.onErrorResume(this::ignoreErrorMono);
} catch (Exception e) {
@@
-249,7
+250,7
@@
public class RefreshConfigTask {
appParser.parse(rootObject);
logger.debug("Local configuration file loaded: {}", filepath);
return Flux.just(rootObject);
appParser.parse(rootObject);
logger.debug("Local configuration file loaded: {}", filepath);
return Flux.just(rootObject);
- } catch (
IOException | Service
Exception e) {
+ } catch (Exception e) {
logger.error("Local configuration file not loaded: {}, {}", filepath, e.getMessage());
return Flux.empty();
}
logger.error("Local configuration file not loaded: {}, {}", filepath, e.getMessage());
return Flux.empty();
}