Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 15 additions & 30 deletions codegen/src/main/resources/templates/StringPrepTables.vm
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ codePoint == $unassignedCodePoints.get(0)
#else
(codePoint >= $unassignedCodePoints.get(0) && codePoint <= $unassignedCodePoints.get(1))
#end
#if($foreach.hasNext) || #end#end
;
#if($foreach.hasNext) || #end#end ;
}

/**
Expand All @@ -45,8 +44,7 @@ codePoint == $unassignedCodePoints.get(0)
public static boolean mapToNothing(int codePoint) {
return #foreach( $mapToNothing in $parser.getMapToNothing() )
codePoint == $mapToNothing
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand Down Expand Up @@ -99,8 +97,7 @@ codePoint == $mapToNothing
public static boolean prohibitionAsciiSpace(int codePoint) {
return #foreach( $asciiSpace in $parser.getAsciiSpace() )
codePoint == $asciiSpace
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -113,8 +110,7 @@ codePoint == $asciiSpace
public static boolean prohibitionNonAsciiSpace(int codePoint) {
return #foreach( $nonAsciiSpace in $parser.getNonAsciiSpace() )
codePoint == $nonAsciiSpace
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -131,8 +127,7 @@ codePoint == $asciiControl.get(0)
#else
(codePoint >= $asciiControl.get(0) && codePoint <= $asciiControl.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -149,8 +144,7 @@ codePoint == $nonAsciiControl.get(0)
#else
(codePoint >= $nonAsciiControl.get(0) && codePoint <= $nonAsciiControl.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -167,8 +161,7 @@ codePoint == $privateUse.get(0)
#else
(codePoint >= $privateUse.get(0) && codePoint <= $privateUse.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -185,8 +178,7 @@ codePoint == $nonCharacterCodePoints.get(0)
#else
(codePoint >= $nonCharacterCodePoints.get(0) && codePoint <= $nonCharacterCodePoints.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -203,8 +195,7 @@ codePoint == $surrogateCodes.get(0)
#else
(codePoint >= $surrogateCodes.get(0) && codePoint <= $surrogateCodes.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -222,8 +213,7 @@ codePoint == $inappropriatePlainText.get(0)
#else
(codePoint >= $inappropriatePlainText.get(0) && codePoint <= $inappropriatePlainText.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -241,8 +231,7 @@ codePoint == $inappropriateCanonicalRepresentation.get(0)
#else
(codePoint >= $inappropriateCanonicalRepresentation.get(0) && codePoint <= $inappropriateCanonicalRepresentation.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -260,8 +249,7 @@ codePoint == $changeDisplayProperties.get(0)
#else
(codePoint >= $changeDisplayProperties.get(0) && codePoint <= $changeDisplayProperties.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -278,8 +266,7 @@ codePoint == $taggingCharacters.get(0)
#else
(codePoint >= $taggingCharacters.get(0) && codePoint <= $taggingCharacters.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -297,8 +284,7 @@ codePoint == $propertyRorAL.get(0)
#else
(codePoint >= $propertyRorAL.get(0) && codePoint <= $propertyRorAL.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

/**
Expand All @@ -316,8 +302,7 @@ codePoint == $propertyL.get(0)
#else
(codePoint >= $propertyL.get(0) && codePoint <= $propertyL.get(1))
#end
#if( $foreach.hasNext ) || #end#end
;
#if( $foreach.hasNext ) || #end#end ;
}

}
2 changes: 1 addition & 1 deletion nameprep/src/it/jpms-nameprep/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.12.2</version>
<version>5.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
<maven.compiler.target>${base.java.version}</maven.compiler.target>
<project.build.outputTimestamp>2024-06-25T23:30:00Z</project.build.outputTimestamp>
<!-- Dependency versions -->
<junit5.version>5.12.2</junit5.version>
<junit5.version>5.13.0</junit5.version>
<!-- Plugins versions -->
<compiler-plugin.version>3.14.0</compiler-plugin.version>
<jar-plugin.version>3.4.2</jar-plugin.version>
<source-plugin.version>3.3.1</source-plugin.version>
<javadoc-plugin.version>3.11.2</javadoc-plugin.version>
<clean-plugin.version>3.4.1</clean-plugin.version>
<clean-plugin.version>3.5.0</clean-plugin.version>
<resources-plugin.version>3.3.1</resources-plugin.version>
<surefire-plugin.version>3.5.3</surefire-plugin.version>
<failsafe-plugin.version>3.5.3</failsafe-plugin.version>
Expand All @@ -96,12 +96,12 @@
<sortpom-plugin.version>4.0.0</sortpom-plugin.version>
<artifact-plugin.version>3.6.0</artifact-plugin.version>
<!-- Checkstyle, SpotBugs and PMD properties -->
<checkstyle.version>10.23.1</checkstyle.version>
<checkstyle.version>10.25.0</checkstyle.version>
<checkstyle-plugin.version>3.6.0</checkstyle-plugin.version>
<spotbugs.version>4.9.3</spotbugs.version>
<spotbugs-plugin.version>4.9.3.0</spotbugs-plugin.version>
<findsecbugs.version>1.14.0</findsecbugs.version>
<pmd.version>7.13.0</pmd.version>
<pmd.version>7.14.0</pmd.version>
<pmd-plugin.version>3.26.0</pmd-plugin.version>
<sonar-plugin.version>5.1.0.4751</sonar-plugin.version>
<forbiddenapis.version>3.9</forbiddenapis.version>
Expand Down
2 changes: 1 addition & 1 deletion saslprep/src/it/jpms-saslprep/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.12.2</version>
<version>5.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion stringprep/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
<dependencies>
<dependency>
<groupId>com.ongres.stringprep</groupId>
Expand Down
2 changes: 1 addition & 1 deletion stringprep/src/it/jpms-stringprep/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.12.2</version>
<version>5.13.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
45 changes: 15 additions & 30 deletions stringprep/src/main/java/com/ongres/stringprep/Tables.java
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,7 @@ public static boolean unassignedCodePoints(int codePoint) {
|| codePoint == 0xE0000
|| (codePoint >= 0xE0002 && codePoint <= 0xE001F)
|| (codePoint >= 0xE0080 && codePoint <= 0xEFFFD)

;
;
}

/**
Expand Down Expand Up @@ -460,8 +459,7 @@ public static boolean mapToNothing(int codePoint) {
|| codePoint == 0xFE0E
|| codePoint == 0xFE0F
|| codePoint == 0xFEFF

;
;
}

/**
Expand Down Expand Up @@ -4919,8 +4917,7 @@ public static int[] mapWithoutNormalization(int codePoint) {
*/
public static boolean prohibitionAsciiSpace(int codePoint) {
return codePoint == 0x0020

;
;
}

/**
Expand Down Expand Up @@ -4948,8 +4945,7 @@ public static boolean prohibitionNonAsciiSpace(int codePoint) {
|| codePoint == 0x202F
|| codePoint == 0x205F
|| codePoint == 0x3000

;
;
}

/**
Expand All @@ -4962,8 +4958,7 @@ public static boolean prohibitionNonAsciiSpace(int codePoint) {
public static boolean prohibitionAsciiControl(int codePoint) {
return (codePoint >= 0x0000 && codePoint <= 0x001F)
|| codePoint == 0x007F

;
;
}

/**
Expand All @@ -4990,8 +4985,7 @@ public static boolean prohibitionNonAsciiControl(int codePoint) {
|| codePoint == 0xFEFF
|| (codePoint >= 0xFFF9 && codePoint <= 0xFFFC)
|| (codePoint >= 0x1D173 && codePoint <= 0x1D17A)

;
;
}

/**
Expand All @@ -5005,8 +4999,7 @@ public static boolean prohibitionPrivateUse(int codePoint) {
return (codePoint >= 0xE000 && codePoint <= 0xF8FF)
|| (codePoint >= 0xF0000 && codePoint <= 0xFFFFD)
|| (codePoint >= 0x100000 && codePoint <= 0x10FFFD)

;
;
}

/**
Expand Down Expand Up @@ -5035,8 +5028,7 @@ public static boolean prohibitionNonCharacterCodePoints(int codePoint) {
|| (codePoint >= 0xEFFFE && codePoint <= 0xEFFFF)
|| (codePoint >= 0xFFFFE && codePoint <= 0xFFFFF)
|| (codePoint >= 0x10FFFE && codePoint <= 0x10FFFF)

;
;
}

/**
Expand All @@ -5048,8 +5040,7 @@ public static boolean prohibitionNonCharacterCodePoints(int codePoint) {
*/
public static boolean prohibitionSurrogateCodes(int codePoint) {
return (codePoint >= 0xD800 && codePoint <= 0xDFFF)

;
;
}

/**
Expand All @@ -5066,8 +5057,7 @@ public static boolean prohibitionInappropriatePlainText(int codePoint) {
|| codePoint == 0xFFFB
|| codePoint == 0xFFFC
|| codePoint == 0xFFFD

;
;
}

/**
Expand All @@ -5080,8 +5070,7 @@ public static boolean prohibitionInappropriatePlainText(int codePoint) {
*/
public static boolean prohibitionInappropriateCanonicalRepresentation(int codePoint) {
return (codePoint >= 0x2FF0 && codePoint <= 0x2FFB)

;
;
}

/**
Expand All @@ -5108,8 +5097,7 @@ public static boolean prohibitionChangeDisplayProperties(int codePoint) {
|| codePoint == 0x206D
|| codePoint == 0x206E
|| codePoint == 0x206F

;
;
}

/**
Expand All @@ -5122,8 +5110,7 @@ public static boolean prohibitionChangeDisplayProperties(int codePoint) {
public static boolean prohibitionTaggingCharacters(int codePoint) {
return codePoint == 0xE0001
|| (codePoint >= 0xE0020 && codePoint <= 0xE007F)

;
;
}

/**
Expand Down Expand Up @@ -5169,8 +5156,7 @@ public static boolean bidirectionalPropertyRorAL(int codePoint) {
|| (codePoint >= 0xFDF0 && codePoint <= 0xFDFC)
|| (codePoint >= 0xFE70 && codePoint <= 0xFE74)
|| (codePoint >= 0xFE76 && codePoint <= 0xFEFC)

;
;
}

/**
Expand Down Expand Up @@ -5542,8 +5528,7 @@ public static boolean bidirectionalPropertyL(int codePoint) {
|| (codePoint >= 0x2F800 && codePoint <= 0x2FA1D)
|| (codePoint >= 0xF0000 && codePoint <= 0xFFFFD)
|| (codePoint >= 0x100000 && codePoint <= 0x10FFFD)

;
;
}

}
Loading