2024.1 Code Drop

Author: skumar7322

RELEASE.md

@@ -1,7 +1,7 @@
                             Release Notes for
                        P4Java, the Perforce Java API
 
-                              Version 2023.2
+                              Version 2024.1
 
 Introduction
 
@@ -22,7 +22,7 @@ Requirements
 
 	* Perforce server at Release 2015.1 or higher.
 
-	* Java: full standard JDK 8 or later.  Implementation as
+	* Java: full standard JDK 11 or later.  Implementation as
 	  discussed in "Known Limitations" below.
 
 	* SSL: unlimited strength JCE (Java Cryptography Extension) package for
@@ -124,6 +124,22 @@ Known Limitations
 	* P4Java would not support file operations on altsync enabled clients.
 
 
+-------------------------------------------
+Updates in 2024.1 (2024.1/2612262) (2024/06/12)
+
+	#2608430 (Job #120559)
+	    Added support for comments in the view mapping of Client, Branch, and Label Spec.
+
+	#2604468 (Job #120573)
+	    Upgraded P4Java to use Java 11.
+
+	#2597460 (Job #119320)
+	    Fixed a bug where the "Server.getExtendedFile(..)" throws NumberFormatException
+	    when headRev is #none
+
+	#2597531 (Job #112324)
+	    Fixed inconsistent handling of quotes in ViewMap for Label.
+
 -------------------------------------------
 Updates in 2023.2 Patch 1 (2023.2/2581742) (2024/04/05)
 

build.gradle

@@ -7,8 +7,8 @@ plugins {
 group = 'com.perforce'
 version = project.hasProperty('ver') ? project.ext.ver : 'PREP-TEST_ONLY'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 repositories {
     maven { url "https://repo.maven.apache.org/maven2" }
@@ -26,8 +26,8 @@ dependencies {
     testImplementation 'org.slf4j:slf4j-simple:1.7.36'
     testImplementation 'org.apache.commons:commons-exec:1.3'
     testImplementation 'org.apache.commons:commons-compress:1.21'
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.7.12'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.mockito:mockito-core:4.0.0'
     testImplementation 'com.googlecode.java-diff-utils:diffutils:1.3.0'
 }
 

gradlew.bat

@@ -188,19 +188,21 @@ public BranchSpec(Map<String, Object> map, IServer server) {
 		super(map, false);
 
 		this.server = server;
-		this.branchView = new ViewMap<IBranchMapping>();
+		this.branchView = new ViewMap<>();
 
 		if (map != null) {
 			String key = MapKeys.VIEW_KEY;
+			String commentKey = MapKeys.VIEW_COMMENT_KEY;
 			for (int i = 0; ; i++) {
-				if (!map.containsKey(key + i)) {
+				if (!map.containsKey(key + i) && !map.containsKey(commentKey + i)) {
 					break;
-				} else if (map.get(key + i) != null) {
+				} else if (map.get(key + i) != null || map.get(commentKey + i) != null) {
 					try {
 						String[] matchStrs = MapEntry.parseViewMappingString((String) map.get(key + i));
-
-						this.branchView.getEntryList().add(new BranchViewMapping(i, matchStrs[0], matchStrs[1]));
-
+						String comment = MapEntry.parseComments((String) map.get(commentKey + i));
+						BranchViewMapping mapping = new BranchViewMapping(i, matchStrs[0], matchStrs[1]);
+						mapping.setComment(comment);
+						this.branchView.getEntryList().add(mapping);
 					} catch (Throwable thr) {
 						Log.error("Unexpected exception in BranchSpec map-based constructor: "
 								+ thr.getLocalizedMessage());

src/main/java/com/perforce/p4java/impl/generic/core/BranchSpec.java

@@ -183,7 +183,7 @@ public static Map<String, Object> map(IClient client) {
 			}
 			IClientOptions opts = client.getOptions();
 			IClientSubmitOptions subOpts = client.getSubmitOptions();
-			ClientView view = client.getClientView();
+
 
 			ArrayList<String> changeView = client.getChangeView();
 			if (changeView != null && !changeView.isEmpty()) {
@@ -205,7 +205,7 @@ public static Map<String, Object> map(IClient client) {
 						+ (opts.isModtime() ? "modtime " : "nomodtime ")
 						+ (opts.isRmdir() ? "rmdir" : "normdir");
 
-				if(opts.toString().split(" ").length > 6)
+				if (opts.toString().split(" ").length > 6)
 					optStr = optStr + (opts.isaltSync() ? " altsync" : " noaltsync");
 
 				clientMap.put("Options", optStr);
@@ -229,9 +229,9 @@ public static Map<String, Object> map(IClient client) {
 				clientMap.put("SubmitOptions", subOptsStr);
 			}
 
+			ClientView view = client.getClientView();
 			if ((view != null) && (view.getEntryList() != null)) {
 				List<IClientViewMapping> viewList = view.getEntryList();
-
 				for (IClientViewMapping mapping : viewList) {
 					clientMap.put(MapKeys.VIEW_KEY + mapping.getOrder(), mapping.toString(" ", true));
 				}

src/main/java/com/perforce/p4java/impl/generic/core/InputMapper.java

@@ -234,17 +234,18 @@ public Label(Map<String, Object> map, IServer server) {
 
 			// Note: only the left (depot) side is given for label views
 
-			this.viewMapping = new ViewMap<ILabelMapping>();
+			this.viewMapping = new ViewMap<>();
 
 			for (int i = 0; ; i++) {
-				String mappingStr = (String) map.get(MapKeys.VIEW_KEY
-						+ i);
-
-				if (mappingStr == null) {
+				String mappingStr = (String) map.get(MapKeys.VIEW_KEY + i);
+				String commentStr = (String) map.get(MapKeys.VIEW_COMMENT_KEY + i);
+				if (mappingStr == null && commentStr == null) {
 					break;
 				} else {
 					String[] parts = MapEntry.parseViewMappingString(mappingStr);
-					this.viewMapping.getEntryList().add(new LabelMapping(i, parts[0]));
+					LabelMapping mapping = new LabelMapping(i, parts[0]);
+					mapping.setComment(MapEntry.parseComments(commentStr));
+					this.viewMapping.getEntryList().add(mapping);
 				}
 			}