diff options
| -rw-r--r-- | docs/release-notes.rst | 40 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/att/nsa/dmaap/service/MMRestService.java | 9 | ||||
| -rw-r--r-- | version.properties | 4 |
5 files changed, 21 insertions, 36 deletions
diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 099966d..f0bbf40 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,17 +1,9 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. -Release Notes -============= +DMAAP Release Notes +=================== -.. note:: - * This Release Notes must be updated each time the team decides to Release new artifacts. - * The scope of this Release Notes is for this particular component. In other words, each ONAP component has its Release Notes. - * This Release Notes is cumulative, the most recently Released artifact is made visible in the top of this Release Notes. - * Except the date and the version number, all the other sections are optional but there must be at least one section describing the purpose of this new release. - * This note must be removed after content has been added. - - -Version: x.y.z +Version: 1.0.1 -------------- @@ -21,8 +13,8 @@ Version: x.y.z **New Features** - - Pub/sub messaging metaphor to broaden data processing opportunities. - - A single solution for most event distribution needs to support a range of environments. + - Pub/sub messaging metaphor to broaden data processing opportunities + - A single solution for most event distribution needs to support a range of environments - Standardized topic names - Implements a RESTful HTTP API for provisioning - Implements a RESTful HTTP API for message transactions (i.e. pub, sub) @@ -32,21 +24,21 @@ Version: x.y.z **Bug Fixes** - - `CIMAN-65 <https://jira.onap.org/browse/CIMAN-65>`_ and a sentence explaining what this defect is addressing. + - `DMAAP-165 <https://jira.onap.org/browse/DMAAP-165>`_ Correct documentation rst file errors and warnings + - `DMAAP-160 <https://jira.onap.org/browse/DMAAP-160>`_ DMaaP periodically loses connection to Kafka + - `DMAAP-157 <https://jira.onap.org/browse/DMAAP-157>`_ SDC service models distribution fails + - `DMAAP-151 <https://jira.onap.org/browse/DMAAP-151>`_ Fix docker image bug + - `DMAAP-1 <https://jira.onap.org/browse/DMAAP-1>`_ MSO DB is not populated with the models from SDC + **Known Issues** - - `CIMAN-65 <https://jira.onap.org/browse/CIMAN-65>`_ and two, three sentences. - One sentences explaining what is the issue. - - Another sentence explaining the impact of the issue. - - And an optional sentence providing a workaround. + - `DMAAP-164 <https://jira.onap.org/browse/DMAAP-164>`_ The dependency from kafka for zookeeper created issues when the vm is restarted + **Security Issues** - You may want to include a reference to CVE (Common Vulnerabilities and Exposures) `CVE <https://cve.mitre.org>`_ - + N/A **Upgrade Notes** - + N/A **Deprecation Notes** - + N/A **Other** @@ -31,7 +31,7 @@ <groupId>org.onap.dmaap.messagerouter.messageservice</groupId> <artifactId>dmaapMR1</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.1.3-SNAPSHOT</version> <name>dmaap-messagerouter-messageservice</name> <description>Message Router - Restful interface built for kafka</description> <licenses> diff --git a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java index 0f7744c..7f12696 100644 --- a/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java +++ b/src/main/java/com/att/nsa/dmaap/filemonitor/ServicePropertiesMap.java @@ -62,6 +62,7 @@ public class ServicePropertiesMap filePath = file.getPath(); } + if(filePath != null) { if(filePath.lastIndexOf(".json")>0){ ObjectMapper om = new ObjectMapper(); @@ -89,6 +90,7 @@ public class ServicePropertiesMap mapOfMaps.put(file.getName(), propMap); } + } logger.info("File - " + file.getName() + " is loaded into the map and the " + "corresponding system properties have been refreshed"); diff --git a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java index 549f46d..206e719 100644 --- a/src/main/java/com/att/nsa/dmaap/service/MMRestService.java +++ b/src/main/java/com/att/nsa/dmaap/service/MMRestService.java @@ -262,7 +262,6 @@ public class MMRestService { inStream = IOUtils.toInputStream(jsonOb.toString(), UTF_8); } catch (IOException ioe) { - ioe.printStackTrace(); LOGGER.error("IOException: ", ioe); } @@ -275,7 +274,6 @@ public class MMRestService { } catch (IOException ioe) { - ioe.printStackTrace(); LOGGER.error("IOException: ", ioe); } @@ -420,7 +418,6 @@ public class MMRestService { inStream = IOUtils.toInputStream(jsonOb.toString(), UTF_8); } catch (IOException ioe) { - ioe.printStackTrace(); LOGGER.error("IOException: ", ioe); } @@ -432,8 +429,6 @@ public class MMRestService { } } catch (IOException ioe) { - - ioe.printStackTrace(); LOGGER.error("IOException: ", ioe); } @@ -582,7 +577,6 @@ public class MMRestService { } } catch (Exception e) { - e.printStackTrace(); LOGGER.error("Exception: ", e); } } @@ -671,7 +665,6 @@ public class MMRestService { inStream = IOUtils.toInputStream(listAll.toString(), UTF_8); } catch (IOException ioe) { - ioe.printStackTrace(); LOGGER.error("IOException: ", ioe); } // call listAllMirrorMaker @@ -832,7 +825,6 @@ public class MMRestService { inStream = IOUtils.toInputStream(listAll.toString(), UTF_8); } catch (IOException ioe) { - ioe.printStackTrace(); LOGGER.error("IOException: ", ioe); } // call listAllMirrorMaker @@ -1012,7 +1004,6 @@ public class MMRestService { inStream = IOUtils.toInputStream(listAll.toString(), UTF_8); } catch (IOException ioe) { - ioe.printStackTrace(); LOGGER.error("IOException: ", ioe); } // call listAllMirrorMaker diff --git a/version.properties b/version.properties index b655931..e1118ab 100644 --- a/version.properties +++ b/version.properties @@ -26,11 +26,11 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=0 +minor=1 patch=1 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT |