Skip to content

Changed rest calls thread #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed rest calls thread #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions org.abapgit.adt.ui/src/org/abapgit/adt/ui/internal/wizards/AbapGitWizardSwitchBranch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.dialogs.IPageChangingListener;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.IWizardContainer;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.plugin.AbstractUIPlugin;

import com.sap.adt.tools.core.model.adtcore.IAdtObjectReference;
Expand Down Expand Up @@ -71,10 +73,10 @@ private void getRepositoryAccessMode() {

public void getPackageRef(String packageName, IProgressMonitor monitor) throws PackageRefNotFoundException {
if (this.packageServiceUI.packageExists(AbapGitWizardSwitchBranch.this.destination, packageName, monitor)) {
List<IAdtObjectReference> packageRefs = this.packageServiceUI.find(AbapGitWizardSwitchBranch.this.destination, packageName, monitor);
List<IAdtObjectReference> packageRefs = this.packageServiceUI.find(AbapGitWizardSwitchBranch.this.destination, packageName,
monitor);
AbapGitWizardSwitchBranch.this.cloneData.packageRef = packageRefs.stream().findFirst().orElse(null);
}
else {
} else {
String error = NLS.bind(Messages.AbapGitWizardSwitch_branch_package_ref_not_found_error, this.selRepoData.getPackage());
throw new PackageRefNotFoundException(error);
}
Expand All @@ -83,9 +85,25 @@ public void getPackageRef(String packageName, IProgressMonitor monitor) throws P
public void getPackageAndRepoType() throws PackageRefNotFoundException {
String packageName = AbapGitWizardSwitchBranch.this.selRepoData.getPackage();
//get package refs
getPackageRef(packageName, new NullProgressMonitor());
// fetches repository access mode
getRepositoryAccessMode();
try {
PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() {

@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
getPackageRef(packageName, new NullProgressMonitor());
Copy link
Collaborator

@shubhamWaghmare-sap shubhamWaghmare-sap Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the package check fails and results in an exception, the wizard still tries to open and fails currently in the Credentials page.
Either we need to somehow stop opening of the wizard if there is an exception or continue have this call in main thread.

// fetches repository access mode
getRepositoryAccessMode();
Copy link
Collaborator

@shubhamWaghmare-sap shubhamWaghmare-sap Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In communication log I checked that there are two calls made to get the externalrepoInfo.
One here and another in the credentials page.
Do we need both ?

} catch (PackageRefNotFoundException e) {
throw new InvocationTargetException(e);
}
}
});
} catch (InvocationTargetException | InterruptedException e) {
MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
Messages.AbapGitWizardSwitch_branch_wizard_title, e.getCause().getMessage());
}

}

@Override
Expand Down