Merge pull request #93 from xdev-software/develop

Release 1.1.3

Author: AB-xdev

.config/checkstyle/checkstyle.xml

@@ -16,7 +16,7 @@
 	<module name="LineLength">
 		<property name="max" value="120"/>
 		<property name="fileExtensions" value="java"/>
-		<!-- Ignore default + links in comments -->
+		<!-- Ignore default + links -->
 		<property name="ignorePattern" value="(^(package|import))|(^\s*(\/\/|\*) .*https?.*$)"/>
 	</module>
 	<module name="NewlineAtEndOfFile"/>
@@ -30,10 +30,6 @@
 	</module>
 
 	<!-- Generated code -->
-	<module name="SuppressionSingleFilter">
-		<property name="checks" value="."/>
-		<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
-	</module>
 	<module name="SuppressionSingleFilter">
 		<property name="checks" value="."/>
 		<property name="files" value="[\\/]src[\\/]gen(erated)?[\\/].*\.java$"/>
@@ -43,7 +39,15 @@
 		<property name="checks" value="MagicNumberCheck"/>
 		<property name="files" value="[\\/]test[\\/].*\.java$"/>
 	</module>
+
+	<!-- Suppressions -->
 	<module name="SuppressWarningsFilter"/>
+	<!-- https://github.com/checkstyle/checkstyle/issues/7287 -->
+	<module name="SuppressWithPlainTextCommentFilter">
+		<property name="offCommentFormat" value="// CHECKSTYLE\:OFF ([\w\|]+)"/>
+		<property name="onCommentFormat" value="// CHECKSTYLE\:ON ([\w\|]+)"/>
+		<property name="checkFormat" value="$1"/>
+	</module>
 
 	<module name="TreeWalker">
 		<!-- Checks - sorted alphabetically -->
@@ -131,11 +135,5 @@
 			<property name="tokens"
 					  value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND"/>
 		</module>
-
-		<!-- Filter -->
-		<module name="SuppressionCommentFilter">
-			<property name="offCommentFormat" value="\s*CHECKSTYLE:OFF\s*[^\s]{1,}"/>
-			<property name="onCommentFormat" value="\s*CHECKSTYLE:ON"/>
-		</module>
 	</module>
 </module>

.github/workflows/release.yml

@@ -6,7 +6,6 @@ on:
 
 env:
   PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
-  DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
 
 permissions:
   contents: write
@@ -58,17 +57,16 @@ jobs:
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "GitHub Actions"
-      
-    - name: Un-SNAP root
-      run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-    
-    - name: Un-SNAP demo
-      run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-      working-directory: ${{ env.DEMO_MAVEN_MODULE }}
   
     - name: Un-SNAP 
-      run: mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: |
+        modules=("") # root
+        modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
+        for i in "${modules[@]}"
+        do
+            echo "Processing $i/pom.xml"
+            (cd "$i" && mvn -B versions:set -DremoveSnapshot -DgenerateBackupPoms=false)
+        done
   
     - name: Get version
       id: version
@@ -204,17 +202,16 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "GitHub Actions"
         git pull
-        
-    - name: Inc Version and SNAP root
-      run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-    
-    - name: Inc Version and SNAP demo
-      run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-      working-directory: ${{ env.DEMO_MAVEN_MODULE }}
-  
+
     - name: Inc Version and SNAP 
-      run: mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
+      run: |
+        modules=("") # root
+        modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
+        for i in "${modules[@]}"
+        do
+            echo "Processing $i/pom.xml"
+            (cd "$i" && mvn -B build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion} -DgenerateBackupPoms=false -DnextSnapshot=true)
+        done
 
     - name: Git Commit and Push
       run: |

.github/workflows/sonar.yml

@@ -53,7 +53,12 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Build with Maven
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} -Dsonar.organization=${{ env.SONARCLOUD_ORG }} -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
+        run: |
+          mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+            -DskipTests \
+            -Dsonar.projectKey=${{ env.SONARCLOUD_ORG }}_${{ github.event.repository.name }} \
+            -Dsonar.organization=${{ env.SONARCLOUD_ORG }} \
+            -Dsonar.host.url=${{ env.SONARCLOUD_HOST }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.idea/codeStyles/Project.xml

@@ -1,3 +1,6 @@
+## 1.1.3
+* Add ``toJsonNative`` method which doesn't run the ``isDrawable`` check #91
+
 ## 1.1.2
 * ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
 

CHANGELOG.md

@@ -92,7 +92,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.12.7</version>
+								<version>10.13.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>

chartjs-java-model-demo/pom.xml

@@ -48,9 +48,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<slf4j-version>2.0.11</slf4j-version>
+		<slf4j-version>2.0.12</slf4j-version>
 		<log4j-version>2.22.1</log4j-version>
-		<testcontainers-version>1.19.3</testcontainers-version>
+		<testcontainers-version>1.19.5</testcontainers-version>
 
 		<!-- by default run no tests as Docker is required -->
 		<skipTests>true</skipTests>
@@ -129,7 +129,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.10.1</version>
+			<version>5.10.2</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -157,7 +157,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>4.16.1</version>
+			<version>4.17.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -309,7 +309,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.12.7</version>
+								<version>10.13.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>

chartjs-java-model/pom.xml

@@ -85,13 +85,8 @@ public T setOptions(final O options)
 	}
 
 	@Override
-	public String toJson()
+	public String toJsonNative()
 	{
-		if(!this.isDrawable())
-		{
-			throw new IllegalArgumentException("Chart is not drawable");
-		}
-		
 		try
 		{
 			return this.objectWriter.writeValueAsString(this);

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/AbstractChart.java

@@ -37,7 +37,20 @@ public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?>>
 	 *
 	 * @return json representation of {@code this} {@link Chart}
 	 */
-	String toJson();
+	String toJsonNative();
+	
+	/**
+	 * Same as {@link #toJsonNative()} but also check if the diagram {@link #isDrawable() is drawable}
+	 * @see #toJson()
+	 */
+	default String toJson()
+	{
+		if(!this.isDrawable())
+		{
+			throw new IllegalArgumentException("Chart is not drawable");
+		}
+		return this.toJsonNative();
+	}
 
 	/**
 	 * <p>

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/Chart.java

@@ -76,7 +76,7 @@ public boolean isDrawable()
 	{
 		for(final PieDataset dataset : this.getData().getDatasets())
 		{
-			if(dataset.getData().size() > 1)
+			if(!dataset.getData().isEmpty())
 			{
 				return true;
 			}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PieChart.java

@@ -76,7 +76,7 @@ public boolean isDrawable()
 	{
 		for(final PolarDataset dataset : this.getData().getDatasets())
 		{
-			if(dataset.getData().size() > 1)
+			if(dataset.getData().size() >= 2)
 			{
 				return true;
 			}

chartjs-java-model/src/main/java/software/xdev/chartjs/model/charts/PolarChart.java

@@ -76,7 +76,7 @@ public boolean isDrawable()
 	{
 		for(final RadarDataset dataset : this.getData().getDatasets())
 		{
-			if(dataset.getData().size() > 2)
+			if(dataset.getData().size() >= 3)
 			{
 				return true;
 			}