Attachment #121265 for bug #214647

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 214647
Collapse All | Expand All




import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.List;
import java.util.concurrent.Callable;

import java.util.logging.Logger;
import java.util.regex.Pattern;
import javax.swing.SwingUtilities;
import org.netbeans.api.keyring.Keyring;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.server.ServerInstance;
import org.netbeans.libs.oracle.cloud.sdkwrapper.api.ApplicationManager;
import org.netbeans.libs.oracle.cloud.sdkwrapper.api.ApplicationManagerConnectionFactory;
import org.netbeans.libs.oracle.cloud.api.CloudSDKHelper;
import org.netbeans.libs.oracle.cloud.sdkwrapper.exception.ManagerException;
import org.netbeans.libs.oracle.cloud.sdkwrapper.model.*;

    private static final Logger LOG = Logger.getLogger(OracleInstance.class.getSimpleName());
    
    private final String name;
    
    /* GuardedBy(this) */
    private boolean userLoaded;
    
    /* GuardedBy(this) */
    private String user;
    
    /* GuardedBy(this) */
    private boolean passwordLoaded;
    
    /* GuardedBy(this) */
    private String password;
    
    private String adminURL;
    private String identityDomain;
    private String javaServiceName;

    
    /* GuardedBy(this) */
    private OracleJ2EEInstance j2eeInstance;

    public OracleInstance(String name, String user, String password, String adminURL, String identityDomain, 
          String javaServiceName, String dbServiceName, String onPremiseServerInstanceId,
          String sdkFolder) {
        this(name, adminURL, identityDomain, javaServiceName, dbServiceName, onPremiseServerInstanceId, sdkFolder);
        this.userLoaded = true;
        this.user = user;
        this.passwordLoaded = true;
        this.password = password;
    }
    
    public OracleInstance(String name, String adminURL, String identityDomain, 
          String adminURL, String identityDomain, 
          String javaServiceName, String dbServiceName, String onPremiseServerInstanceId,
          String sdkFolder) {
        this.name = name;
        this.user = user;
        this.password = password;
        this.adminURL = adminURL;
        this.identityDomain = identityDomain;
        this.javaServiceName = javaServiceName;

    }
    
    public String getPassword() {
        synchronized (this) {
            if (passwordLoaded) {
                return password;
            }
        }
        
        return loadCredentials().getPassword();
    }

    public String getUser() {
        synchronized (this) {
            if (userLoaded) {
                return user;
            }
        }
        
        return loadCredentials().getUsername();
    }

    public String getAdminURL() {

    }

    public void setPassword(String password) {
        this.password = password;
        synchronized (this) {
            this.password = password;
            this.passwordLoaded = true;
            if (j2eeInstance != null) {
                j2eeInstance.getInstanceProperties().setProperty(
                                    InstanceProperties.PASSWORD_ATTR, password);

    }

    public void setUser(String user) {
        this.user = user;
        synchronized (this) {
            this.user = user;
            this.userLoaded = true;
            if (j2eeInstance != null) {
                j2eeInstance.getInstanceProperties().setProperty(
                                    InstanceProperties.USERNAME_ATTR, user);

        }
    }
    
    private Credentials loadCredentials() {
        char ch[] = Keyring.read(OracleInstanceManager.PREFIX
                + OracleInstanceManager.USERNAME + "." + name);
        if (ch == null) {
            LOG.log(Level.WARNING, "no username found for "+name);
            ch = new char[]{' '};
        }
        String userName = new String(ch);
        assert userName != null : "username is missing for "+name; // NOI18N
        
        ch = Keyring.read(OracleInstanceManager.PREFIX
                + OracleInstanceManager.PASSWORD + "." + name);
        if (ch == null) {
            LOG.log(Level.WARNING, "no password found for "+name);
            ch = new char[]{' '};
        }
        String passwd = new String(ch);
        assert passwd != null : "password is missing for "+name; // NOI18N
        
        synchronized (this) {
            if (!userLoaded) {
                userLoaded = true;
                user = userName;
            }
            if (!passwordLoaded) {
                passwordLoaded = true;
                password = passwd;
            }
            return new Credentials(user, password);
        }
    }
    
    private synchronized void resetCache() {
        platform = null;
    }
    
    public synchronized ApplicationManager getApplicationManager() {
        if (platform == null) {
            platform = createApplicationManager(adminURL, getUser(), getPassword(), sdkFolder);
        }
        return platform;
    }

        return sb.toString();
    }
    
    private static class Credentials {
        
        private final String username;
        
        private final String password;

        public Credentials(String username, String password) {
            this.username = username;
            this.password = password;
        }

        public String getUsername() {
            return username;
        }

        public String getPassword() {
            return password;
        }
    }
    
}





    private static final String ORACLE_IP_NAMESPACE = "cloud.oracle"; // NOI18N
    
    static final String PREFIX = "org.netbeans.modules.cloud.oracle."; // NOI18N
    static final String USERNAME = "username"; // NOI18N
    static final String PASSWORD = "password"; // NOI18N
    private static final String NAME = "name"; // NOI18N
    private static final String ADMIN_URL = "admin-url"; // NOI18N
    private static final String IDENTITY_DOMAIN = "identity-domain"; // NOI18N

            String name = props.getString(NAME, null); // NOI18N
            assert name != null : "Instance without name";
            String adminURL = props.getString(ADMIN_URL, ""); // NOI18N

            char ch[] = Keyring.read(PREFIX+USERNAME+"."+name);
            if (ch == null) {
                LOG.log(Level.WARNING, "no username found for "+name);
                ch = new char[]{' '};
            }
            String userName = new String(ch);
            assert userName != null : "username is missing for "+name; // NOI18N
            ch = Keyring.read(PREFIX+PASSWORD+"."+name);
            if (ch == null) {
                LOG.log(Level.WARNING, "no password found for "+name);
                ch = new char[]{' '};
            }
            String password = new String(ch);
            assert password != null : "password is missing for "+name; // NOI18N
            String identityDomain = props.getString(IDENTITY_DOMAIN, "undefined"); // NOI18N
            String javaServiceName = props.getString(JAVA_SERVICE_NAME, "undefined"); // NOI18N
            String databaseServiceName = props.getString(DATABASE_SERVICE_NAME, ""); // NOI18N
            String onPremise = props.getString(ON_PREMISE_SERVICE_INSTANCE_ID, null); // NOI18N
            String sdkFolder = CloudSDKHelper.getSDKFolder();
            result.add(new OracleInstance(name, adminURL, identityDomain, javaServiceName, databaseServiceName, onPremise, sdkFolder));
        }
        return result;
    }

Return to bug 214647

Lines 47-54 Link Here

(-)a/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OracleInstance.java (-12 / +94 lines)
47	import java.io.IOException;	47	import java.io.IOException;
48	import java.io.InputStream;	48	import java.io.InputStream;
49	import java.io.UnsupportedEncodingException;	49	import java.io.UnsupportedEncodingException;
50	import java.net.MalformedURLException;
51	import java.net.URL;
52	import java.nio.charset.Charset;	50	import java.nio.charset.Charset;
53	import java.util.List;	51	import java.util.List;
54	import java.util.concurrent.Callable;	52	import java.util.concurrent.Callable;
Lines 57-68 Link Here
57	import java.util.logging.Logger;	55	import java.util.logging.Logger;
58	import java.util.regex.Pattern;	56	import java.util.regex.Pattern;
59	import javax.swing.SwingUtilities;	57	import javax.swing.SwingUtilities;
		58	import org.netbeans.api.keyring.Keyring;
60	import org.netbeans.api.project.FileOwnerQuery;	59	import org.netbeans.api.project.FileOwnerQuery;
61	import org.netbeans.api.project.Project;	60	import org.netbeans.api.project.Project;
62	import org.netbeans.api.project.ProjectUtils;	61	import org.netbeans.api.project.ProjectUtils;
63	import org.netbeans.api.server.ServerInstance;	62	import org.netbeans.api.server.ServerInstance;
64	import org.netbeans.libs.oracle.cloud.sdkwrapper.api.ApplicationManager;	63	import org.netbeans.libs.oracle.cloud.sdkwrapper.api.ApplicationManager;
65	import org.netbeans.libs.oracle.cloud.sdkwrapper.api.ApplicationManagerConnectionFactory;
66	import org.netbeans.libs.oracle.cloud.api.CloudSDKHelper;	64	import org.netbeans.libs.oracle.cloud.api.CloudSDKHelper;
67	import org.netbeans.libs.oracle.cloud.sdkwrapper.exception.ManagerException;	65	import org.netbeans.libs.oracle.cloud.sdkwrapper.exception.ManagerException;
68	import org.netbeans.libs.oracle.cloud.sdkwrapper.model.*;	66	import org.netbeans.libs.oracle.cloud.sdkwrapper.model.*;
Lines 94-101 Link Here
94	private static final Logger LOG = Logger.getLogger(OracleInstance.class.getSimpleName());	92	private static final Logger LOG = Logger.getLogger(OracleInstance.class.getSimpleName());
95		93
96	private final String name;	94	private final String name;
		95
		96	/* GuardedBy(this) */
		97	private boolean userLoaded;
		98
		99	/* GuardedBy(this) */
97	private String user;	100	private String user;
		101
		102	/* GuardedBy(this) */
		103	private boolean passwordLoaded;
		104
		105	/* GuardedBy(this) */
98	private String password;	106	private String password;
		107
99	private String adminURL;	108	private String adminURL;
100	private String identityDomain;	109	private String identityDomain;
101	private String javaServiceName;	110	private String javaServiceName;
Lines 109-122 Link Here
109		118
110	/* GuardedBy(this) */	119	/* GuardedBy(this) */
111	private OracleJ2EEInstance j2eeInstance;	120	private OracleJ2EEInstance j2eeInstance;
		121
		122	public OracleInstance(String name, String user, String password, String adminURL, String identityDomain,
		123	String javaServiceName, String dbServiceName, String onPremiseServerInstanceId,
		124	String sdkFolder) {
		125	this(name, adminURL, identityDomain, javaServiceName, dbServiceName, onPremiseServerInstanceId, sdkFolder);
		126	this.userLoaded = true;
		127	this.user = user;
		128	this.passwordLoaded = true;
		129	this.password = password;
		130	}
112		131
113	public OracleInstance(String name, String user, String password,	132	public OracleInstance(String name, String adminURL, String identityDomain,
114	String adminURL, String identityDomain,
115	String javaServiceName, String dbServiceName, String onPremiseServerInstanceId,	133	String javaServiceName, String dbServiceName, String onPremiseServerInstanceId,
116	String sdkFolder) {	134	String sdkFolder) {
117	this.name = name;	135	this.name = name;
118	this.user = user;
119	this.password = password;
120	this.adminURL = adminURL;	136	this.adminURL = adminURL;
121	this.identityDomain = identityDomain;	137	this.identityDomain = identityDomain;
122	this.javaServiceName = javaServiceName;	138	this.javaServiceName = javaServiceName;
Lines 138-148 Link Here
138	}	154	}
139		155
140	public String getPassword() {	156	public String getPassword() {
141	return password;	157	synchronized (this) {
		158	if (passwordLoaded) {
		159	return password;
		160	}
		161	}
		162
		163	return loadCredentials().getPassword();
142	}	164	}
143		165
144	public String getUser() {	166	public String getUser() {
145	return user;	167	synchronized (this) {
		168	if (userLoaded) {
		169	return user;
		170	}
		171	}
		172
		173	return loadCredentials().getUsername();
146	}	174	}
147		175
148	public String getAdminURL() {	176	public String getAdminURL() {
Lines 189-196 Link Here
189	}	217	}
190		218
191	public void setPassword(String password) {	219	public void setPassword(String password) {
192	this.password = password;
193	synchronized (this) {	220	synchronized (this) {
		221	this.password = password;
		222	this.passwordLoaded = true;
194	if (j2eeInstance != null) {	223	if (j2eeInstance != null) {
195	j2eeInstance.getInstanceProperties().setProperty(	224	j2eeInstance.getInstanceProperties().setProperty(
196	InstanceProperties.PASSWORD_ATTR, password);	225	InstanceProperties.PASSWORD_ATTR, password);
Lines 200-207 Link Here
200	}	229	}
201		230
202	public void setUser(String user) {	231	public void setUser(String user) {
203	this.user = user;
204	synchronized (this) {	232	synchronized (this) {
		233	this.user = user;
		234	this.userLoaded = true;
205	if (j2eeInstance != null) {	235	if (j2eeInstance != null) {
206	j2eeInstance.getInstanceProperties().setProperty(	236	j2eeInstance.getInstanceProperties().setProperty(
207	InstanceProperties.USERNAME_ATTR, user);	237	InstanceProperties.USERNAME_ATTR, user);
Lines 234-246 Link Here
234	}	264	}
235	}	265	}
236		266
		267	private Credentials loadCredentials() {
		268	char ch[] = Keyring.read(OracleInstanceManager.PREFIX
		269	+ OracleInstanceManager.USERNAME + "." + name);
		270	if (ch == null) {
		271	LOG.log(Level.WARNING, "no username found for "+name);
		272	ch = new char[]{' '};
		273	}
		274	String userName = new String(ch);
		275	assert userName != null : "username is missing for "+name; // NOI18N
		276
		277	ch = Keyring.read(OracleInstanceManager.PREFIX
		278	+ OracleInstanceManager.PASSWORD + "." + name);
		279	if (ch == null) {
		280	LOG.log(Level.WARNING, "no password found for "+name);
		281	ch = new char[]{' '};
		282	}
		283	String passwd = new String(ch);
		284	assert passwd != null : "password is missing for "+name; // NOI18N
		285
		286	synchronized (this) {
		287	if (!userLoaded) {
		288	userLoaded = true;
		289	user = userName;
		290	}
		291	if (!passwordLoaded) {
		292	passwordLoaded = true;
		293	password = passwd;
		294	}
		295	return new Credentials(user, password);
		296	}
		297	}
		298
237	private synchronized void resetCache() {	299	private synchronized void resetCache() {
238	platform = null;	300	platform = null;
239	}	301	}
240		302
241	public synchronized ApplicationManager getApplicationManager() {	303	public synchronized ApplicationManager getApplicationManager() {
242	if (platform == null) {	304	if (platform == null) {
243	platform = createApplicationManager(adminURL, user, password, sdkFolder);	305	platform = createApplicationManager(adminURL, getUser(), getPassword(), sdkFolder);
244	}	306	}
245	return platform;	307	return platform;
246	}	308	}
Lines 529-532 Link Here
529	return sb.toString();	591	return sb.toString();
530	}	592	}
531		593
		594	private static class Credentials {
		595
		596	private final String username;
		597
		598	private final String password;
		599
		600	public Credentials(String username, String password) {
		601	this.username = username;
		602	this.password = password;
		603	}
		604
		605	public String getUsername() {
		606	return username;
		607	}
		608
		609	public String getPassword() {
		610	return password;
		611	}
		612	}
		613
532	}	614	}

Lines 59-67 Link Here

(-)a/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OracleInstanceManager.java (-19 / +5 lines)
59		59
60	private static final String ORACLE_IP_NAMESPACE = "cloud.oracle"; // NOI18N	60	private static final String ORACLE_IP_NAMESPACE = "cloud.oracle"; // NOI18N
61		61
62	private static final String PREFIX = "org.netbeans.modules.cloud.oracle."; // NOI18N	62	static final String PREFIX = "org.netbeans.modules.cloud.oracle."; // NOI18N
63	private static final String USERNAME = "username"; // NOI18N	63	static final String USERNAME = "username"; // NOI18N
64	private static final String PASSWORD = "password"; // NOI18N	64	static final String PASSWORD = "password"; // NOI18N
65	private static final String NAME = "name"; // NOI18N	65	private static final String NAME = "name"; // NOI18N
66	private static final String ADMIN_URL = "admin-url"; // NOI18N	66	private static final String ADMIN_URL = "admin-url"; // NOI18N
67	private static final String IDENTITY_DOMAIN = "identity-domain"; // NOI18N	67	private static final String IDENTITY_DOMAIN = "identity-domain"; // NOI18N
Lines 165-191 Link Here
165	String name = props.getString(NAME, null); // NOI18N	165	String name = props.getString(NAME, null); // NOI18N
166	assert name != null : "Instance without name";	166	assert name != null : "Instance without name";
167	String adminURL = props.getString(ADMIN_URL, ""); // NOI18N	167	String adminURL = props.getString(ADMIN_URL, ""); // NOI18N
168		168
169	char ch[] = Keyring.read(PREFIX+USERNAME+"."+name);
170	if (ch == null) {
171	LOG.log(Level.WARNING, "no username found for "+name);
172	ch = new char[]{' '};
173	}
174	String userName = new String(ch);
175	assert userName != null : "username is missing for "+name; // NOI18N
176	ch = Keyring.read(PREFIX+PASSWORD+"."+name);
177	if (ch == null) {
178	LOG.log(Level.WARNING, "no password found for "+name);
179	ch = new char[]{' '};
180	}
181	String password = new String(ch);
182	assert password != null : "password is missing for "+name; // NOI18N
183	String identityDomain = props.getString(IDENTITY_DOMAIN, "undefined"); // NOI18N	169	String identityDomain = props.getString(IDENTITY_DOMAIN, "undefined"); // NOI18N
184	String javaServiceName = props.getString(JAVA_SERVICE_NAME, "undefined"); // NOI18N	170	String javaServiceName = props.getString(JAVA_SERVICE_NAME, "undefined"); // NOI18N
185	String databaseServiceName = props.getString(DATABASE_SERVICE_NAME, ""); // NOI18N	171	String databaseServiceName = props.getString(DATABASE_SERVICE_NAME, ""); // NOI18N
186	String onPremise = props.getString(ON_PREMISE_SERVICE_INSTANCE_ID, null); // NOI18N	172	String onPremise = props.getString(ON_PREMISE_SERVICE_INSTANCE_ID, null); // NOI18N
187	String sdkFolder = CloudSDKHelper.getSDKFolder();	173	String sdkFolder = CloudSDKHelper.getSDKFolder();
188	result.add(new OracleInstance(name, userName, password, adminURL, identityDomain, javaServiceName, databaseServiceName, onPremise, sdkFolder));	174	result.add(new OracleInstance(name, adminURL, identityDomain, javaServiceName, databaseServiceName, onPremise, sdkFolder));
189	}	175	}
190	return result;	176	return result;
191	}	177	}