Author: adietish Date: 2011-09-27 11:33:52 -0400 (Tue, 27 Sep 2011) New Revision: 35062 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/UserInfoAware.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/User.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java Log: [JBIDE-9773] correcting ApplicationLogReader implementation and adding new tests Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ApplicationLogReader.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -21,11 +21,6 @@ import org.jboss.ide.eclipse.as.openshift.core.internal.User; /** - * TODO: make sure it behaves correctly on subsequent requests that get app - * status on the server: The server would either repeat the whole log or just - * respond with the diff. - * - * * @author André Dietisheim */ public class ApplicationLogReader extends Reader { @@ -80,11 +75,6 @@ return charactersRead; } - private boolean isSameStatus(String status, String currentStatus) { - return currentStatus != null - && currentStatus.equals(status); - } - protected StringReader createLogReader(String status) throws IOException { String log = getLog(status); return new StringReader(log); @@ -103,7 +93,7 @@ try { String status = service.getStatus(application.getName(), application.getCartridge(), user); if (isSameStatus(status, currentStatus)) { - return null; + status = null; } return status; @@ -112,6 +102,11 @@ } } + private boolean isSameStatus(String thisStatus, String otherStatus) { + return otherStatus != null + && otherStatus.equals(thisStatus); + } + @Override public void close() throws IOException { if (logReader != null) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/IApplication.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -35,7 +35,7 @@ public void stop() throws OpenshiftException; - public ApplicationLogReader getLog() throws OpenshiftException; + public ApplicationLogReader getLogReader() throws OpenshiftException; public String getGitUri() throws OpenshiftException; Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserFactory.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserFactory.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -0,0 +1,11 @@ +package org.jboss.ide.eclipse.as.openshift.core; + +import org.jboss.ide.eclipse.as.openshift.core.internal.User; + +public class UserFactory { + + public static IUser create(String rhlogin, String password) { + return new User(rhlogin, password); + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/UserFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Application.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -21,33 +21,26 @@ /** * @author André Dietisheim */ -public class Application implements IApplication { +public class Application extends UserInfoAware implements IApplication { private static final String GIT_URI_PATTERN = "ssh://{0}@{1}-{2}.{3}/~/git/{1}.git/"; private static final String APPLICATION_URL_PATTERN = "http://{0}-{1}.{2}/"; private String name; private ICartridge cartridge; - private String uuid; - private Date creationTime; - private String embedded; private IOpenshiftService service; private ApplicationLogReader logReader; + private ApplicationInfo applicationInfo; - private User user; - public Application(String name, ICartridge cartridge, User user, IOpenshiftService service) { - this(name, null, cartridge, null, null, user, service); + this(name, cartridge, null, user, service); } - public Application(String name, String uuid, ICartridge cartridge, String embedded, Date creationTime, User user, + public Application(String name, ICartridge cartridge, ApplicationInfo applicationInfo, User user, IOpenshiftService service) { + super(user); this.name = name; this.cartridge = cartridge; - this.uuid = uuid; - this.embedded = embedded; - this.creationTime = creationTime; - this.user = user; this.service = service; } @@ -57,8 +50,7 @@ @Override public String getUUID() throws OpenshiftException { - user.loadLazyValues(); - return uuid; + return getApplicationInfo().getUuid(); } @Override @@ -68,47 +60,45 @@ @Override public String getEmbedded() throws OpenshiftException { - user.loadLazyValues(); - return embedded; + return getApplicationInfo().getEmbedded(); } @Override public Date getCreationTime() throws OpenshiftException { - user.loadLazyValues(); - return creationTime; + return getApplicationInfo().getCreationTime(); } @Override public void destroy() throws OpenshiftException { - service.destroyApplication(name, cartridge, user); + service.destroyApplication(name, cartridge, getUser()); } @Override public void start() throws OpenshiftException { - service.startApplication(name, cartridge, user); + service.startApplication(name, cartridge, getUser()); } @Override public void restart() throws OpenshiftException { - service.restartApplication(name, cartridge, user); + service.restartApplication(name, cartridge, getUser()); } @Override public void stop() throws OpenshiftException { - service.stopApplication(name, cartridge, user); + service.stopApplication(name, cartridge, getUser()); } @Override - public ApplicationLogReader getLog() throws OpenshiftException { + public ApplicationLogReader getLogReader() throws OpenshiftException { if (logReader == null) { - this.logReader = new ApplicationLogReader(this, user, service); + this.logReader = new ApplicationLogReader(this, getUser(), service); } return logReader; } @Override public String getGitUri() throws OpenshiftException { - IDomain domain = user.getDomain(); + IDomain domain = getUser().getDomain(); if (domain == null) { return null; } @@ -118,29 +108,22 @@ @Override public String getApplicationUrl() throws OpenshiftException { - IDomain domain = user.getDomain(); + IDomain domain = getUser().getDomain(); if (domain == null) { return null; } return MessageFormat.format(APPLICATION_URL_PATTERN, name, domain.getNamespace(), domain.getRhcDomain()); } - void update(ApplicationInfo applicationInfo) { - if (applicationInfo == null) { - return; - } - this.cartridge = applicationInfo.getCartridge(); - this.creationTime = applicationInfo.getCreationTime(); - this.name = applicationInfo.getName(); - this.uuid = applicationInfo.getUuid(); - } - protected IOpenshiftService getService() { return service; } - protected User getUser() { - return user; + protected ApplicationInfo getApplicationInfo() throws OpenshiftException { + if (applicationInfo == null) { + this.applicationInfo = getUserInfo().getApplicationInfoByName(getName()); + } + return applicationInfo; } @Override Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/Domain.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -16,20 +16,17 @@ /** * @author André Dietisheim */ -public class Domain implements IDomain { +public class Domain extends UserInfoAware implements IDomain { private String namespace; - private String rhcDomain; - private User user; public Domain(String namespace, User user) { this(namespace, null, user); } public Domain(String namespace, String rhcDomain, User user) { + super(user); this.namespace = namespace; - this.rhcDomain = rhcDomain; - this.user = user; } @Override @@ -39,12 +36,6 @@ @Override public String getRhcDomain() throws OpenshiftException { - user.loadLazyValues(); - return rhcDomain; + return getUserInfo().getRhcDomain(); } - - void update(UserInfo userInfo) { - this.rhcDomain = userInfo.getRhcDomain(); - this.namespace = userInfo.getNamespace(); - } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/User.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/User.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/User.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -28,7 +28,6 @@ private String rhlogin; private String password; - private String uuid; private ISSHPublicKey sshKey; private Domain domain; private UserInfo userInfo; @@ -54,13 +53,19 @@ @Override public IDomain getDomain() throws OpenshiftException { - loadLazyValues(); + if (domain == null) { + this.domain = new Domain( + getUserInfo().getNamespace() + , getUserInfo().getRhcDomain(), this); + } return domain; } @Override public ISSHPublicKey getSshKey() throws OpenshiftException { - loadLazyValues(); + if (sshKey == null) { + sshKey = getUserInfo().getSshPublicKey(); + } return sshKey; } @@ -75,8 +80,7 @@ } public String getUUID() throws OpenshiftException { - loadLazyValues(); - return uuid; + return getUserInfo().getUuid(); } @Override @@ -96,14 +100,15 @@ @Override public Collection<IApplication> getApplications() throws OpenshiftException { - loadLazyValues(); + if (getUserInfo().getApplicationInfos().size() > applications.size()) { + update(getUserInfo().getApplicationInfos()); + } return Collections.unmodifiableList(applications); } @Override public IApplication getApplicationByName(String name) throws OpenshiftException { - loadLazyValues(); - return getApplicationByName(name, applications); + return getApplicationByName(name, getApplications()); } private IApplication getApplicationByName(String name, Collection<IApplication> applications) { @@ -128,53 +133,23 @@ this.sshKey = key; } - /** - * Loads the lazy values from the server if needed. Updates itself all - * referenced objects (applications, domain). - * - * @throws OpenshiftException - * if an error occurred while loading the values - */ - void loadLazyValues() throws OpenshiftException { + public UserInfo getUserInfo() throws OpenshiftException { if (userInfo == null) { - refresh(); + this.userInfo = service.getUserInfo(this); } + return userInfo; } public void refresh() throws OpenshiftException { - this.userInfo = service.getUserInfo(this); - update(userInfo); + this.domain = null; + this.sshKey = null; + getUserInfo(); } - - private void update(UserInfo userInfo) throws OpenshiftException { - this.uuid = userInfo.getUuid(); - updateDomain(userInfo); - updateSshPublicKey(userInfo); - update(userInfo.getApplicationInfos()); - } - - private void updateDomain(UserInfo userInfo) { - if (domain == null) { - this.domain = new Domain(userInfo.getNamespace(), userInfo.getRhcDomain(), this); - } else { - domain.update(userInfo); - } - } - - private void updateSshPublicKey(UserInfo userInfo) throws OpenshiftException { - if (sshKey == null) { - sshKey = userInfo.getSshPublicKey(); - } else { - sshKey.update(userInfo.getSshPublicKey()); - } - } - + private void update(List<ApplicationInfo> applicationInfos) { for (ApplicationInfo applicationInfo : applicationInfos) { IApplication application = getApplicationByName(applicationInfo.getName(), applications); - if (application != null) { - ((Application) application).update(applicationInfo); - } else { + if (application == null) { applications.add(createApplication(applicationInfo)); } } @@ -182,10 +157,8 @@ private Application createApplication(ApplicationInfo applicationInfo) { return new Application(applicationInfo.getName() - , applicationInfo.getUuid() , applicationInfo.getCartridge() - , applicationInfo.getEmbedded() - , applicationInfo.getCreationTime() + , applicationInfo , this, service); } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/UserInfoAware.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/UserInfoAware.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/UserInfoAware.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.openshift.core.internal; + +import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; + +public class UserInfoAware { + + private UserInfo userInfo; + private User user; + + protected UserInfoAware(User user) { + this.user = user; + } + + protected UserInfo getUserInfo() throws OpenshiftException { + if (userInfo == null) { + this.userInfo = user.getUserInfo(); + } + return userInfo; + } + + protected User getUser() { + return user; + } + +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/UserInfoAware.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationLogReaderIntegrationTest.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -12,10 +12,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.concurrent.BlockingQueue; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; import org.jboss.ide.eclipse.as.openshift.core.ApplicationLogReader; import org.jboss.ide.eclipse.as.openshift.core.IApplication; @@ -34,7 +38,7 @@ */ public class ApplicationLogReaderIntegrationTest { - private static final long TIMEOUT = 6 * 1024; + private static final long TIMEOUT = 10; private IOpenshiftService service; private TestUser user; @@ -88,22 +92,21 @@ public void logReaderReturnsNewEntriesAfterApplicationRestart() throws Exception { IApplication application = null; ExecutorService executor = null; - long startTime = System.currentTimeMillis(); try { application = user.createTestApplication(); - ApplicationLogReader logReader = application.getLog(); + ApplicationLogReader logReader = application.getLogReader(); LogReaderRunnable logReaderRunnable = new LogReaderRunnable(logReader); executor = Executors.newSingleThreadExecutor(); executor.submit(logReaderRunnable); - boolean logAvailable = waitForNewLogEntries(0, startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable); - int logLength = logReaderRunnable.getLog().length(); - assertTrue(logReaderRunnable.isRunning()); - assertTrue(logAvailable); + + String log = logReaderRunnable.waitUntilNoNewLogentries(); + assertNotNull(log); + assertTrue(log.length() > 0); + application.restart(); - logAvailable = waitForNewLogEntries(logLength, startTime, System.currentTimeMillis() + TIMEOUT, logReaderRunnable); - assertTrue(logAvailable); - assertTrue(logReaderRunnable.isRunning()); - assertTrue(logReaderRunnable.getLog().length() > logLength); + + String newLog = logReaderRunnable.waitUntilNoNewLogentries(); + assertFalse(log.equals(newLog)); } finally { if (executor != null) { executor.shutdownNow(); @@ -114,50 +117,42 @@ } } - protected boolean waitForNewLogEntries(int logLength, long startTime, long timeout, LogReaderRunnable logReaderRunnable) - throws InterruptedException { - while (logReaderRunnable.isEmpty() - && logReaderRunnable.getLog().length() <= logLength - && System.currentTimeMillis() <= timeout) { - Thread.sleep(1 * 1024); - } - return logReaderRunnable.getLog().length() > logLength; - } - private static class LogReaderRunnable implements Runnable { private ApplicationLogReader logReader; - private StringBuilder builder; - private boolean running; + private BlockingQueue<Character> logQueue; public LogReaderRunnable(ApplicationLogReader logReader) { this.logReader = logReader; - this.builder = new StringBuilder(); + this.logQueue = new LinkedBlockingDeque<Character>(); } @Override public void run() { - this.running = true; try { for (int data = -1; (data = logReader.read()) != -1;) { - builder.append((char) data); + logQueue.put((char) data); } } catch (Exception e) { - this.running = false; + // do nothing } } - public boolean isRunning() { - return running; + private boolean waitForNewLogentries(StringBuilder builder) throws InterruptedException { + Character character = logQueue.poll(TIMEOUT, TimeUnit.SECONDS); + boolean newEntry = character != null; + if (newEntry) { + builder.append(character); + } + return newEntry; } - public String getLog() { + public String waitUntilNoNewLogentries() throws InterruptedException { + StringBuilder builder = new StringBuilder(); + while (waitForNewLogentries(builder)) { + ; + } return builder.toString(); } - - public boolean isEmpty() { - return builder.length() == 0; - } } - } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/ApplicationTest.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -156,7 +156,7 @@ } @Test - public void applicationLogReaderReturnsAllowsToReadFromStatus() throws IOException { + public void canReadFromApplicationLogReader() throws IOException { OpenshiftService service = new NoopOpenshiftServiceFake() { @Override @@ -170,27 +170,34 @@ ApplicationResponseFake.APPLICATION_CARTRIDGE, user, service); ApplicationLogReader reader = new ApplicationLogReader(application, user, service); - int toMatchIndex = 0; - for (int character = -1; (character = reader.read()) != -1;) { + int charactersRead = 0; + int character = -1; + while (charactersRead < ApplicationResponseFake.log.length() + && (character = reader.read()) != -1) { + char characterToMatch = ApplicationResponseFake.log.charAt(charactersRead++); assertEquals( - "character at position " + toMatchIndex - + " was '" + ((char) character) + "'" - + " but we expected '" + ApplicationResponseFake.log.charAt(toMatchIndex) + "'.", - ApplicationResponseFake.log.charAt(toMatchIndex++), character); + "character at position " + charactersRead + + " was '" + character + "'" + + " but we expected '" + characterToMatch + "'.", + characterToMatch, character); } } private IApplication createApplication(OpenshiftService userInfoService, User user) { Application application = new Application( ApplicationResponseFake.APPLICATION_NAME - , ApplicationResponseFake.APPLICATION_UUID , ApplicationResponseFake.APPLICATION_CARTRIDGE - , ApplicationResponseFake.APPLICATION_EMBEDDED - , ApplicationResponseFake.APPLICATION_CREATIONTIME + , new ApplicationInfo( + ApplicationResponseFake.APPLICATION_NAME + , ApplicationResponseFake.APPLICATION_UUID + , ApplicationResponseFake.APPLICATION_EMBEDDED + , ApplicationResponseFake.APPLICATION_CARTRIDGE + , ApplicationResponseFake.APPLICATION_CREATIONTIME) , user , userInfoService); /** - * we have to add it manually since we dont create the application with the user class + * we have to add it manually since we dont create the application with + * the user class * * @see User#createApplication */ Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java 2011-09-27 15:19:36 UTC (rev 35061) +++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/utils/ApplicationAsserts.java 2011-09-27 15:33:52 UTC (rev 35062) @@ -69,6 +69,7 @@ public static void assertApplication(String name, String uuid, String cartridgeName, String embedded, String creationTime, IApplication application) throws OpenshiftException { + assertNotNull(application); assertEquals(embedded, application.getEmbedded()); assertEquals(uuid, application.getUUID()); assertNotNull(application.getCartridge());