2025.2 Code Drop

Author: ajindal-mdx

LICENSE.txt

@@ -67,10 +67,6 @@ commons-io-2.17.0.jar
     LicenseText: License Text Under Appendix
 
   Copyrights:
-    Copyright:   Copyright 2002-2024 The Apache Software Foundation
-    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/57a467f1-c18e-4293-807f-683b2ac78980
-    Author:      The Apache Software Foundation
-
     Copyright:   Copyright The Apache Software Foundation
     Reference:   https://commons.apache.org/proper/commons-io/
 
@@ -81,10 +77,6 @@ commons-lang3-3.12.0.jar
     LicenseText: License Text Under Appendix
 
   Copyrights:
-    Copyright:   Copyright 2001-2021 The Apache Software Foundation
-    Reference:   https://index.whitesourcesoftware.com/gri/app/reader/resource/content/asString/11239b3a-f2b6-4016-bd0c-c0ce1d0fa09e
-    Author:      The Apache Software Foundation
-
     Copyright:   Copyright The Apache Software Foundation
     Reference:   https://commons.apache.org/proper/commons-lang/
 

RELEASE.md

@@ -1,7 +1,7 @@
                             Release Notes for
                          P4Java, P4 API for Java
 
-                              Version 2025.1
+                              Version 2025.2
 
 Introduction
 
@@ -33,7 +33,7 @@ Important Product Rebrand Notice
 
 Requirements
 
-	* This release of P4Java supports the 2025.1 P4 Server. Older releases 
+	* This release of P4Java supports the 2025.2 P4 Server. Older releases 
 	  might work but are not supported.
 
 	* Java: full standard JDK 11 or later.  Implementation as
@@ -137,6 +137,21 @@ Known Limitations
 	  
 	* P4Java would not support file operations on altsync enabled clients.
 
+-------------------------------------------
+Updates in 2025.2 (2025.2/2872146) (2025/12/18)
+
+	#2860533 (Job #129866)
+		Add support for new LimitView field in p4 client spec.
+	   	
+	#2860878 (Job #129860)
+		Add support for '-m' option with "p4 key" command. 
+
+	#2860121 (Job #121997)
+		Add retries option for commands if the network times out.
+
+	#2867620 (Job #127869)
+		Added support for client progress callback.
+
 -------------------------------------------
 Updates in 2025.1 (2025.1/2785811) (2025/06/24)
 

src/main/java/com/perforce/p4java/client/BaseProgressReport.java

@@ -0,0 +1,153 @@
+package com.perforce.p4java.client;
+
+import com.perforce.p4java.server.callback.progress.ProgressUnit;
+
+/**
+ * Base implementation of IProgressReport with state tracking.
+ * Uses boolean flags instead of bitwise operations.
+ * Corresponds to ProgressReport class in C++.
+ */
+public abstract class BaseProgressReport implements IProgressReport {
+
+	// ========== Boolean Change Flags ==========
+	protected boolean descriptionChanged;
+	protected boolean unitsChanged;
+	protected boolean totalChanged;
+	protected boolean positionChanged;
+	protected boolean isNewProgress;
+
+
+	// ========== Instance Variables ==========
+	protected String description;
+	protected ProgressUnit units;
+	protected long total;
+
+	protected long position;
+	protected boolean needFinal;
+	protected long lastUpdateTime;
+
+
+	public BaseProgressReport() {
+		this.descriptionChanged = false;
+		this.unitsChanged = false;
+		this.totalChanged = false;
+		this.positionChanged = false;
+		this.isNewProgress = true;
+		this.description = "";
+		this.units = ProgressUnit.UNSPECIFIED;
+		this.total = 0;
+		this.position = 0;
+		this.needFinal = false;
+		this.lastUpdateTime = System.currentTimeMillis();
+	}
+
+
+	// ========== Interface Implementation ==========
+
+	@Override
+	public void description(String description) {
+		this.description = description;
+		this.descriptionChanged = true;
+	}
+
+	@Override
+	public void units(ProgressUnit units) {
+		this.units = units;
+		this.unitsChanged = true;
+	}
+
+	@Override
+	public void total(long total) {
+		this.total = total;
+		this.totalChanged = true;
+	}
+
+	@Override
+	public void position(long position) {
+		position(position, CPP_NORMAL);
+	}
+
+	@Override
+	public void position(long position, int flag) {
+		if (this.position != position) {
+			this.position = position;
+			this.positionChanged = true;
+		}
+		considerReport(flag);
+	}
+
+	@Override
+	public void increment() {
+		increment(1, CPP_NORMAL);
+	}
+
+	@Override
+	public void increment(long amount) {
+		increment(amount, CPP_NORMAL);
+	}
+
+	@Override
+	public void increment(long amount, int flag) {
+		if (amount != 0) {
+			this.position += amount;
+			this.positionChanged = true;
+		}
+		considerReport(flag);
+	}
+
+	@Override
+	public long getPosition() {
+		return position;
+	}
+
+	@Override
+	public long getTotal() {
+		return total;
+	}
+
+	@Override
+	public String getDescription() {
+		return description;
+	}
+
+	@Override
+	public ProgressUnit getUnits() {
+		return units;
+	}
+
+
+	protected void considerReport(int flag) {
+
+	/*	if (flag == CPP_NORMAL) {
+			long now = System.currentTimeMillis();
+			long elapsed = now - lastUpdateTime;
+			if (elapsed < 1) {
+				lastUpdateTime = System.currentTimeMillis();
+				return;
+			}
+		}*/
+		doReport(flag);
+	}
+
+	protected void clearChangeFlags() {
+		descriptionChanged = false;
+		unitsChanged = false;
+		totalChanged = false;
+		positionChanged = false;
+		isNewProgress = false;
+	}
+
+	protected abstract void doReport(int flag);
+
+
+	@Override
+	protected void finalize() throws Throwable {
+		try {
+			if (needFinal) {
+				doReport(CPP_FAILDONE);
+			}
+		} finally {
+			super.finalize();
+		}
+	}
+}

src/main/java/com/perforce/p4java/client/ClientProgressReport.java

@@ -0,0 +1,80 @@
+package com.perforce.p4java.client;
+
+import com.perforce.p4java.server.callback.progress.IProgress;
+
+
+public class ClientProgressReport extends BaseProgressReport {
+
+
+	protected IProgress cp;
+
+	public ClientProgressReport(IProgress cp) {
+		super();
+		if (cp == null) {
+			throw new IllegalArgumentException("ClientProgress cannot be null");
+		}
+		this.cp = cp;
+	}
+
+
+	@Override
+	public void doReport(int flag) {
+		if (cp == null) {
+			return;
+		}
+
+		if (descriptionChanged || unitsChanged) {
+			cp.description(description, units);
+		}
+
+
+		if (totalChanged) {
+			cp.total(total);
+		}
+
+
+		if (positionChanged) {
+			cp.update(position);
+		}
+
+
+		clearChangeFlags();
+
+
+		if (flag == CPP_DONE || flag == CPP_FAILDONE) {
+			if (flag == CPP_FAILDONE)
+				cp.done(1);
+			else
+				cp.done(0);
+			needFinal = false;
+		}
+	}
+
+
+	public IProgress getClientProgress() {
+		return cp;
+	}
+
+	public void close() {
+		if (needFinal) {
+			doReport(CPP_FAILDONE);
+		}
+	}
+
+	@Override
+	public boolean isComplete() {
+		return total > 0 && position == total;
+	}
+
+	@Override
+	protected void finalize() throws Throwable {
+		try {
+			if (needFinal) {
+				doReport(CPP_FAILDONE);
+			}
+
+		} finally {
+			super.finalize();
+		}
+	}
+}

src/main/java/com/perforce/p4java/client/IClient.java

@@ -93,6 +93,21 @@ public interface IClient extends IClientSummary, IWhereDelegator {
 	 */
 	void setChangeView(ArrayList<String> changeView);
 
+	/**
+	 * Get the Perforce limit view associated with this client, if any.
+	 *
+	 * @return the Perforce limit view associated with this client, if any;
+	 * null otherwise.
+	 * */
+	ArrayList<String> getLimitView();
+
+	/**
+	 * Set the Perforce limit view associated with this client.
+	 *
+	 * @param limitView new List of limit views for the client.
+	 */
+	void setLimitView(ArrayList<String> limitView);
+
 	/**
 	 * Return the IServer object representing the Perforce server associated with this
 	 * Perforce client.

src/main/java/com/perforce/p4java/client/IProgressReport.java

@@ -0,0 +1,36 @@
+package com.perforce.p4java.client;
+
+import com.perforce.p4java.server.callback.progress.ProgressUnit;
+
+public interface IProgressReport {
+	int CPP_NORMAL = 0;
+	int CPP_DONE = 1;
+	int CPP_FAILDONE = 2;
+	int CPP_FLUSH = 3;
+
+	void description(String description);
+
+	void units(ProgressUnit units);
+
+	void total(long total);
+
+	void position(long position);
+
+	void position(long position, int flag);
+
+	void increment();
+
+	void increment(long amount);
+
+	void increment(long amount, int flag);
+
+	long getPosition();
+
+	long getTotal();
+
+	String getDescription();
+
+	ProgressUnit getUnits();
+
+	boolean isComplete();
+}

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

@@ -196,6 +196,17 @@ public static Map<String, Object> map(IClient client) {
 				}
 			}
 
+			ArrayList<String> limitView = client.getLimitView();
+			if (limitView != null && !limitView.isEmpty()) {
+				int i = 0;
+
+				for (String changeEntry : limitView) {
+					if (changeEntry != null) {
+						clientMap.put("LimitView" + i++, changeEntry);
+					}
+				}
+			}
+
 			if (opts != null) {
 				String optStr = ""
 						+ (opts.isAllWrite() ? "allwrite " : "noallwrite ")

src/main/java/com/perforce/p4java/impl/mapbased/MapKeys.java

@@ -143,6 +143,7 @@ public class MapKeys {
 	public static final String VIEW_DEPOT_TYPE = "ViewDepotType";
 
 	public static final String CHANGE_VIEW_KEY = "ChangeView";
+	public static final String LIMIT_VIEW_KEY = "LimitView";
 	public static final String CLIENT_BACKUP_KEY = "Backup";
 
 	public static final String FIELDS_KEY = "Fields";