Merge branch 'release/6.2'

.gitignore

@@ -7,8 +7,7 @@ target/
 .settings/
 .classpath
 .vscode/
-
-
+.factorypath
 
 maven-confluence-parent.iml
 maven-confluence-reporting-plugin/confluence-reporting-maven-plugin.iml
@@ -64,3 +63,5 @@ patches
 
 #
 maven-project-info-reports-plugin/
+
+

README.md

@@ -21,6 +21,9 @@ Please donate whether you wish support us to give more time to plugin's growth |
 
 ### News ###
 
+Feb 7, 2019 | [Release 6.2](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v6.2) | available from  **[MAVEN CENTRAL REPO](http://search.maven.org/#artifactdetails%7Corg.bsc.maven%7Cconfluence-reporting-maven-plugin%7C6.2%7Cmaven-plugin)**  |
+---- | ---- | ---- |
+
 jan 16, 2019 | [Release 6.1](https://github.com/bsorrentino/maven-confluence-plugin/releases/tag/v6.1) | available from  **[MAVEN CENTRAL REPO](http://search.maven.org/#artifactdetails%7Corg.bsc.maven%7Cconfluence-reporting-maven-plugin%7C6.1%7Cmaven-plugin)**  |
 ---- | ---- | ---- |
 

maven-confluence-core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>6.1</version>
+        <version>6.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -112,7 +112,11 @@
             <groupId>org.pegdown</groupId>
             <artifactId>pegdown</artifactId>
         </dependency>
-
+		<dependency>
+		  <groupId>org.parboiled</groupId>
+		  <artifactId>parboiled-java</artifactId>
+		  <version>1.1.7</version>
+		</dependency>
 		<dependency>
 		  <groupId>com.fasterxml.jackson.dataformat</groupId>
 		  <artifactId>jackson-dataformat-yaml</artifactId>

maven-confluence-core/src/main/java/org/bsc/confluence/xmlrpc/BlogEntry.java

@@ -121,8 +121,8 @@ public void setLocks(int locks) {
 
     public Map<String,Object> toRawMap() {
         Map<String,Object> map = super.toRawMap();
-        map.put("version", new Integer(getVersion()));
-        map.put("locks", new Integer(getLocks()));
+        map.put("version", getVersion());
+        map.put("locks", getLocks());
         return map;
     }
 

maven-confluence-core/src/main/java/org/bsc/confluence/xmlrpc/BlogEntrySummary.java

@@ -101,7 +101,7 @@ public void setPublishDate(Date publishDate) {
     public Map<String,Object> toRawMap() {
         Map<String,Object> map = super.toRawMap();
         map.put("publishDate", getPublishDate());
-        map.put("locks", new Integer(getLocks()));
+        map.put("locks", getLocks());
         return map;
     }
 

maven-confluence-core/src/main/java/org/bsc/confluence/xmlrpc/Confluence.java

@@ -161,7 +161,7 @@ public boolean logout() throws Exception {
      * exports a Confluence instance and returns a String holding the URL for the download. The boolean argument indicates whether or not attachments ought to be included in the export.
      */
     public String exportSite(boolean exportAttachments) throws Exception {
-        return (String) call("exportSite", new Boolean(exportAttachments));
+        return (String) call("exportSite", exportAttachments);
     }
 
     /**
@@ -374,7 +374,7 @@ public byte[] getAttachmentData(String pageId, String fileName, String versionNu
      * add a new attachment to a content entity object. *Note that this uses a lot of memory -- about 4 times the size of the attachment.*
      */
     public Attachment addAttachment(long contentId, Attachment attachment, byte[] attachmentData) throws Exception {
-        Map<String,Object> data = call("addAttachment", new Long(contentId), attachment, attachmentData);
+        Map<String,Object> data = call("addAttachment", contentId, attachment, attachmentData);
         return new Attachment(data);
     }
 
@@ -423,7 +423,7 @@ public BlogEntry storeBlogEntry(BlogEntry entry) throws Exception {
      * Retrieves a blog post in the Space with the given spaceKey, with the title 'postTitle' and posted on the day 'dayOfMonth'.
      */
     public BlogEntry getBlogEntryByDayAndTitle(String spaceKey, int dayOfMonth, String postTitle) throws Exception {
-        Map<String,Object> data = call("getBlogEntryByDayAndTitle", spaceKey, new Integer(dayOfMonth), postTitle);
+        Map<String,Object> data = call("getBlogEntryByDayAndTitle", spaceKey, dayOfMonth, postTitle);
         return new BlogEntry(data);
     }
 
@@ -432,7 +432,7 @@ public BlogEntry getBlogEntryByDayAndTitle(String spaceKey, int dayOfMonth, Stri
      * empty parameter map.
      */
     public List<Object>search(String query, int maxResults) throws Exception {
-        Object[] vector = (Object[]) call("search", query, new Integer(maxResults));
+        Object[] vector = (Object[]) call("search", query, maxResults);
         return toList(vector, SearchResult.class);
     }
 
@@ -441,7 +441,7 @@ public BlogEntry getBlogEntryByDayAndTitle(String spaceKey, int dayOfMonth, Stri
      * default is used instead.
      */
     public List<Object>search(String query, Map<?,?> parameters, int maxResults) throws Exception {
-        Object[] vector = (Object[]) call("search", query, parameters, new Integer(maxResults));
+        Object[] vector = (Object[]) call("search", query, parameters, (maxResults));
         return toList(vector, SearchResult.class);
     }
 
@@ -647,7 +647,7 @@ public boolean reactivateUser(String username) throws Exception {
      * returns all registered users as Strings
      */
     public List<Object>getActiveUsers(boolean viewAll) throws Exception {
-        Object[] vector = (Object[]) call("getActiveUsers", new Boolean(viewAll));
+        Object[] vector = (Object[]) call("getActiveUsers", (viewAll));
         return Arrays.asList(vector);
     }
 
@@ -687,39 +687,39 @@ public boolean changeUserPassword(String username, String newPass) throws Except
      * Returns all {@link Label}s for the given ContentEntityObject ID
      */
     public List<Object>getLabelsById(long objectId) throws Exception {
-        Object[] vector = (Object[]) call("getLabelsById", new Long(objectId));
+        Object[] vector = (Object[]) call("getLabelsById", (objectId));
         return toList(vector, Label.class);
     }
 
     /**
      * Returns the most popular {@link Label}s for the Confluence instance, with a specified maximum number.
      */
     public List<Object>getMostPopularLabels(int maxCount) throws Exception {
-        Object[] vector = (Object[]) call("getMostPopularLabels", new Integer(maxCount));
+        Object[] vector = (Object[]) call("getMostPopularLabels", (maxCount));
         return toList(vector, Label.class);
     }
 
     /**
      * Returns the most popular {@link Label}s for the given {{spaceKey}}, with a specified maximum number of results.
      */
     public List<Object>getMostPopularLabelsInSpace(String spaceKey, int maxCount) throws Exception {
-        Object[] vector = (Object[]) call("getMostPopularLabelsInSpace", spaceKey, new Integer(maxCount));
+        Object[] vector = (Object[]) call("getMostPopularLabelsInSpace", spaceKey, (maxCount));
         return toList(vector, Label.class);
     }
 
     /**
      * Returns the recently used {@link Label}s for the Confluence instance, with a specified maximum number of results.
      */
     public List<Object>getRecentlyUsedLabels(int maxResults) throws Exception {
-        Object[] vector = (Object[]) call("getRecentlyUsedLabels", new Integer(maxResults));
+        Object[] vector = (Object[]) call("getRecentlyUsedLabels", (maxResults));
         return toList(vector, Label.class);
     }
 
     /**
      * Returns the recently used {@link Label}s for the given {{spaceKey}}, with a specified maximum number of results.
      */
     public List<Object>getRecentlyUsedLabelsInSpace(String spaceKey, int maxResults) throws Exception {
-        Object[] vector = (Object[]) call("getRecentlyUsedLabelsInSpace", spaceKey, new Integer(maxResults));
+        Object[] vector = (Object[]) call("getRecentlyUsedLabelsInSpace", spaceKey, (maxResults));
         return toList(vector, Label.class);
     }
 
@@ -735,15 +735,15 @@ public boolean changeUserPassword(String username, String newPass) throws Except
      * Returns the {@link Label}s related to the given label name, with a specified maximum number of results.
      */
     public List<Object>getRelatedLabels(String labelName, int maxResults) throws Exception {
-        Object[] vector = (Object[]) call("getRelatedLabels", labelName, new Integer(maxResults));
+        Object[] vector = (Object[]) call("getRelatedLabels", labelName, (maxResults));
         return toList(vector, Label.class);
     }
 
     /**
      * Returns the {@link Label}s related to the given label name for the given {{spaceKey}}, with a specified maximum number of results.
      */
     public List<Object>getRelatedLabelsInSpace(String labelName, String spaceKey, int maxResults) throws Exception {
-        Object[] vector = (Object[]) call("getRelatedLabelsInSpace", labelName, spaceKey, new Integer(maxResults));
+        Object[] vector = (Object[]) call("getRelatedLabelsInSpace", labelName, spaceKey, (maxResults));
         return toList(vector, Label.class);
     }
 
@@ -759,7 +759,7 @@ public boolean changeUserPassword(String username, String newPass) throws Except
      * Returns the content for a given label ID
      */
     public List<Object> getLabelContentById(long labelId) throws Exception {
-        Object[] vector = (Object[]) call("getLabelContentById", new Long(labelId));
+        Object[] vector = (Object[]) call("getLabelContentById", (labelId));
         return Arrays.asList(vector);
     }
 
@@ -791,23 +791,23 @@ public List<Object> getSpacesContainingContentWithLabel(String labelName) throws
      * Adds a label to the object with the given ContentEntityObject ID.
      */
     public boolean addLabelByName(String labelName, long objectId) throws Exception {
-        Boolean value = (Boolean) call("addLabelByName", labelName, new Long(objectId));
+        Boolean value = (Boolean) call("addLabelByName", labelName, (objectId));
         return value.booleanValue();
     }
 
     /**
      * Adds a label with the given ID to the object with the given ContentEntityObject ID.
      */
     public boolean addLabelById(long labelId, long objectId) throws Exception {
-        Boolean value = (Boolean) call("addLabelById", new Long(labelId), new Long(objectId));
+        Boolean value = (Boolean) call("addLabelById", (labelId), (objectId));
         return value.booleanValue();
     }
 
     /**
      * Adds the given label object to the object with the given ContentEntityObject ID.
      */
     public boolean addLabelByObject(Label labelObject, long objectId) throws Exception {
-        Boolean value = (Boolean) call("addLabelByObject", labelObject, new Long(objectId));
+        Boolean value = (Boolean) call("addLabelByObject", labelObject, (objectId));
         return value.booleanValue();
     }
 
@@ -823,23 +823,23 @@ public boolean addLabelByNameToSpace(String labelName, String spaceKey) throws E
      * Removes the given label from the object with the given ContentEntityObject ID.
      */
     public boolean removeLabelByName(String labelName, long objectId) throws Exception {
-        Boolean value = (Boolean) call("removeLabelByName", labelName, new Long(objectId));
+        Boolean value = (Boolean) call("removeLabelByName", labelName, (objectId));
         return value.booleanValue();
     }
 
     /**
      * Removes the label with the given ID from the object with the given ContentEntityObject ID.
      */
     public boolean removeLabelById(long labelId, long objectId) throws Exception {
-        Boolean value = (Boolean) call("removeLabelById", new Long(labelId), new Long(objectId));
+        Boolean value = (Boolean) call("removeLabelById", (labelId), (objectId));
         return value.booleanValue();
     }
 
     /**
      * Removes the given label object from the object with the given ContentEntityObject ID.
      */
     public boolean removeLabelByObject(Label labelObject, long objectId) throws Exception {
-        Boolean value = (Boolean) call("removeLabelByObject", labelObject, new Long(objectId));
+        Boolean value = (Boolean) call("removeLabelByObject", labelObject, (objectId));
         return value.booleanValue();
     }
 

maven-confluence-core/src/main/java/org/bsc/confluence/xmlrpc/MapObject.java

@@ -76,11 +76,11 @@ protected void setString(String key, String value) {
     }
 
     protected void setInt(String key, int value) {
-        fields.put(key, new Integer(value));
+        fields.put(key,value);
     }
 
     protected void setInt(String key, String value) {
-        fields.put(key, new Integer(value));
+        fields.put(key, value);
     }
 
     protected int getInt(String key) {
@@ -101,7 +101,7 @@ protected int getInt(String key) {
     }
 
     protected void setBoolean(String key, boolean value) {
-        fields.put(key, new Boolean(value));
+        fields.put(key, value);
     }
 
     protected void setBoolean(String key, String value) {

maven-confluence-core/src/main/java/org/bsc/confluence/xmlrpc/ServerInfo.java

@@ -99,10 +99,10 @@ public void setBaseUrl(String baseUrl) {
 
     public Map<String,Object> toRawMap() {
         Map<String,Object> map = super.toRawMap();
-        map.put("majorVersion", new Integer(getMajorVersion()));
-        map.put("minorVersion", new Integer(getMinorVersion()));
-        map.put("patchLevel", new Integer(getPatchLevel()));
-        map.put("developmentBuild", new Boolean(isDevelopmentBuild()));
+        map.put("majorVersion", getMajorVersion());
+        map.put("minorVersion", getMinorVersion());
+        map.put("patchLevel", getPatchLevel());
+        map.put("developmentBuild", isDevelopmentBuild());
         return map;
     }
 }

maven-confluence-core/src/main/java/org/bsc/confluence/xmlrpc/UserInformation.java

@@ -122,7 +122,7 @@ public void setLastModificationDate(Date lastModificationDate) {
 
     public Map<String,Object> toRawMap() {
         Map<String,Object> map = super.toRawMap();
-        map.put("version", new Integer(getVersion()));
+        map.put("version", getVersion());
         map.put("creationDate", getCreationDate());
         map.put("lastModificationDate", getLastModificationDate());
         return map;

maven-confluence-core/src/main/java/org/bsc/confluence/xmlrpc/XMLRPCConfluenceServiceImpl.java

@@ -209,7 +209,7 @@ public CompletableFuture<Model.Attachment> addAttachment(Model.Page page, Model.
 
             a.setPageId( page.getId() );
 
-            result.complete(connection.addAttachment( new Long(page.getId()), a, baos.toByteArray() ));     
+            result.complete(connection.addAttachment( Long.parseLong(page.getId()), a, baos.toByteArray() ));     
 
         } catch (Exception e) {
             result.completeExceptionally(e);

maven-confluence-core/src/test/java/org/bsc/confluence/model/SiteTest.java

@@ -4,7 +4,7 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
-import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
 
 import java.io.IOException;
 import java.io.InputStream;

maven-confluence-itest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>maven-confluence-parent</artifactId>
         <groupId>org.bsc.maven</groupId>
-        <version>6.1</version>
+        <version>6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -44,7 +44,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>