Updated jcommander version, Some minor adjustments

Author: Markus Binsteiner

pom.xml

@@ -192,7 +192,7 @@
 		<dependency>
 			<groupId>com.beust</groupId>
 			<artifactId>jcommander</artifactId>
-			<version>1.25</version>
+			<version>1.30</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jcraft</groupId>

src/main/java/grith/jgrith/cred/AbstractCred.java

@@ -97,6 +97,19 @@ public Class getValueClass() {
 	public static AbstractCred create(AbstractCallback callback) {
 		return loadFromConfig(null, callback);
 	}
+	
+	public static AbstractCred getExistingOrCliCredential() {
+		
+		ProxyCred pc = new ProxyCred();
+		
+		if ( pc.isValid() ) {
+			return pc;
+		}
+		
+		AbstractCred c = AbstractCred.loadFromConfig(null, new CliCallback());
+		
+		return c;
+	}
 
 	public static AbstractCred loadFromConfig(Map<PROPERTY, Object> config) {
 		return loadFromConfig(config, null);
@@ -225,7 +238,7 @@ public static void main(String[] args) throws Exception {
 	private CredentialMinThreshold minThresholdTask = null;
 
 	private CredentialRenewTask renewTask = null;
-	private final Timer timer = new Timer(true);
+	private final Timer timer = new Timer("CredentialUpdate timer", true);
 
 	private boolean saveProxyOnCreation = true;
 

src/main/java/grith/jgrith/cred/GridCliParameters.java

@@ -42,7 +42,7 @@ public class GridCliParameters {
 	@Parameter(names = { "-s", "--start-session" }, description = "start or use existing background session to hold and update credential (on Linux)")
 	private boolean startGridSession;
 
-	@Parameter(names = { "-h", "--help" }, description = "display this help text")
+	@Parameter(names = { "-h", "--help" }, description = "display this help text", help = true)
 	private boolean help;
 
 	private char[] password;

src/main/java/grith/jgrith/cred/GridLoginParameters.java

@@ -32,17 +32,25 @@ public class GridLoginParameters {
 
 	public static GridLoginParameters createFromCommandlineArgs(
 			GridCliParameters params, String[] args) {
+		return createFromCommandlineArgs(params, args, true);
+	}
+
+	public static GridLoginParameters createFromCommandlineArgs(
+			GridCliParameters params, String[] args, boolean exitWhenHelp) {
 
 		// GridLoginParameters glp = new GridLoginParameters();
 		try {
-			
-			String[] gridArgs = CommandlineArgumentHelpers.extractGridParameters(params, args);
-			
+
+			String[] gridArgs = CommandlineArgumentHelpers
+					.extractGridParameters(params, args);
+
 			JCommander jc = new JCommander(params, gridArgs);
 
-			if (params.isHelp()) {
-				jc.usage();
-				System.exit(0);
+			if (exitWhenHelp) {
+				if (params.isHelp()) {
+					jc.usage();
+					System.exit(0);
+				}
 			}
 
 			return createFromGridCliParameters(params);
@@ -54,7 +62,8 @@ public static GridLoginParameters createFromCommandlineArgs(
 
 	}
 
-	public static GridLoginParameters createFromGridCliParameters(GridCliParameters settings) {
+	public static GridLoginParameters createFromGridCliParameters(
+			GridCliParameters settings) {
 		GridLoginParameters glp = new GridLoginParameters();
 		try {
 
@@ -174,21 +183,18 @@ public Map<PROPERTY, Object> getCredProperties() {
 
 		return result;
 	}
-	
-	
+
 	public String getInstitution() {
 		return institution.getValue();
 	}
 
-
 	public LoginType getLoginType() {
 		if (loginType == null) {
 			return null;
 		}
 		return LoginType.fromString(loginType.getValue());
 	}
 
-
 	public String getMyProxyHost() {
 		return myproxyHost.getValue();
 	}
@@ -221,8 +227,7 @@ public void populate() {
 
 		LoginType lt = getLoginType();
 
-
-		if ( lt == null ) {
+		if (lt == null) {
 			String idp = institution.getValue();
 			if (StringUtils.isBlank(idp)) {
 				idp = CommonGridProperties.getDefault().getLastShibIdp();
@@ -267,19 +272,19 @@ public void populate() {
 
 			loginType.set(lt.toString());
 
-			switch(lt) {
+			switch (lt) {
 			case SHIBBOLETH:
 				String idpToUse = institution.getValue();
 				if (StringUtils.isBlank(idpToUse)) {
 					String answer = callback.getStringValue(institution);
 					institution.set(answer);
 				}
-				if (! username.isSet() ) {
+				if (!username.isSet()) {
 					String answer = callback.getStringValue(username);
 					username.set(answer);
 				}
 
-				if (! password.isSet()) {
+				if (!password.isSet()) {
 					char[] answer = callback.getPasswordValue(password);
 					password.set(answer);
 				}
@@ -313,11 +318,10 @@ public void populate() {
 					"No valid credential after callbacks.");
 		}
 
-
 	}
 
 	public void setCallback(AbstractCallback c) {
-		this.callback =c;
+		this.callback = c;
 	}
 
 	private void setForceAuthenticate(boolean forceAuth) {

src/main/java/grith/jgrith/utils/CommandlineArgumentHelpers.java

@@ -88,7 +88,7 @@ public static Set<String> booleanParams(GridCliParameters params) {
 
     	for ( ParameterDescription pd : list ) {
 
-    		Class type = pd.getField().getType();
+    		Class type = pd.getParameterized().getType();
     		if ( type == boolean.class || type == Boolean.class ) {
         		String[] tokens = pd.getNames().split(",");
         		for ( String token : tokens ) {
@@ -110,7 +110,7 @@ public static Set<String> nonBooleanParameters(GridCliParameters params) {
 
     	for ( ParameterDescription pd : list ) {
 
-    		Class type = pd.getField().getType();
+    		Class type = pd.getParameterized().getType();
     		if ( type != boolean.class && type != Boolean.class ) {
         		String[] tokens = pd.getNames().split(",");
         		for ( String token : tokens ) {