Skip to content
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

Fix bug 4307: Selecting the wrong module automatically when adding gr… #4461

Merged
merged 2 commits into from
Jun 18, 2020
Merged

Fix bug 4307: Selecting the wrong module automatically when adding gr… #4461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab7f4a8
Fix bug 4307: Selecting the wrong module automatically when adding gr…
Jun 18, 2020
8c283e7
Fix a typo
Jun 18, 2020
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
57 changes: 39 additions & 18 deletions ...-toolkit-for-intellij/src/com/microsoft/intellij/runner/functions/core/FunctionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@
public class FunctionUtils {
public static final String FUNCTION_JAVA_LIBRARY_ARTIFACT_ID = "azure-functions-java-library";

private static final String AZURE_FUNCTION_ANNOTATION_CLASS = "com.microsoft.azure.functions.annotation.FunctionName";
private static final String AZURE_FUNCTION_ANNOTATION_CLASS =
"com.microsoft.azure.functions.annotation.FunctionName";
private static final String FUNCTION_JSON = "function.json";
private static final String HTTP_OUTPUT_DEFAULT_NAME = "$return";
private static final String DEFAULT_HOST_JSON = "{\"version\":\"2.0\",\"extensionBundle\":" +
Expand All @@ -103,19 +104,24 @@ public static boolean isValidStagingFolderPath(String stagingFolderPath) {
}

public static Module[] listFunctionModules(Project project) {
MavenProjectsManager mpm = MavenProjectsManager.getInstance(project);
final Module[] modules = ModuleManager.getInstance(project).getModules();
return Arrays.stream(modules).filter(m -> {
if (mpm.findProject(m) == null) {
return false;
}
final GlobalSearchScope scope = GlobalSearchScope.moduleWithLibrariesScope(m);
final PsiClass ecClass = JavaPsiFacade.getInstance(project).findClass(AZURE_FUNCTION_ANNOTATION_CLASS, scope);
final PsiClass ecClass = JavaPsiFacade.getInstance(project).findClass(AZURE_FUNCTION_ANNOTATION_CLASS,
scope);
return ecClass != null;
}).toArray(Module[]::new);
}

public static Module getFunctionModuleByName(Project project, String name) {
final Module[] modules = listFunctionModules(project);
return Arrays.stream(modules)
.filter(module -> StringUtils.equals(name, module.getName()))
.findFirst().orElse(null);
.filter(module -> StringUtils.equals(name, module.getName()))
.findFirst().orElse(null);
}

public static boolean isFunctionProject(Project project) {
Expand All @@ -134,9 +140,12 @@ public static boolean isFunctionProject(Project project) {

public static PsiMethod[] findFunctionsByAnnotation(Module module) {
final PsiClass functionNameClass = JavaPsiFacade.getInstance(module.getProject())
.findClass(AZURE_FUNCTION_ANNOTATION_CLASS, GlobalSearchScope.moduleWithLibrariesScope(module));
.findClass(AZURE_FUNCTION_ANNOTATION_CLASS,
GlobalSearchScope.moduleWithLibrariesScope(module));
final List<PsiMethod> methods = new ArrayList<>(AnnotatedElementsSearch
.searchPsiMethods(functionNameClass, GlobalSearchScope.moduleScope(module)).findAll());
.searchPsiMethods(functionNameClass,
GlobalSearchScope.moduleScope(module))
.findAll());
return methods.toArray(new PsiMethod[0]);
}

Expand All @@ -145,7 +154,8 @@ public static final Path getDefaultHostJson(Project project) {
}

public static boolean isFunctionClassAnnotated(final PsiMethod method) {
return MetaAnnotationUtil.isMetaAnnotated(method, ContainerUtil.immutableList(FunctionUtils.AZURE_FUNCTION_ANNOTATION_CLASS));
return MetaAnnotationUtil.isMetaAnnotated(method,
ContainerUtil.immutableList(FunctionUtils.AZURE_FUNCTION_ANNOTATION_CLASS));
}

public static final Path createTempleHostJson() {
Expand All @@ -158,7 +168,8 @@ public static final Path createTempleHostJson() {
}
}

private static void copyFilesWithDefaultContent(Path sourcePath, File dest, String defaultContent) throws IOException {
private static void copyFilesWithDefaultContent(Path sourcePath, File dest, String defaultContent)
throws IOException {
final File src = sourcePath == null ? null : sourcePath.toFile();
if (src != null && src.exists()) {
FileUtils.copyFile(src, dest);
Expand All @@ -175,15 +186,18 @@ private static void updateLocalSettingValues(File target, Map<String, String> ap
JsonUtils.writeJsonToFile(target, jsonObject);
}

public static void copyLocalSettingsToStagingFolder(Path stagingFolder, Path localSettingJson, Map<String, String> appSettings) throws IOException {
public static void copyLocalSettingsToStagingFolder(Path stagingFolder,
Path localSettingJson,
Map<String, String> appSettings) throws IOException {
final File localSettingsFile = new File(stagingFolder.toFile(), "local.settings.json");
copyFilesWithDefaultContent(localSettingJson, localSettingsFile, DEFAULT_LOCAL_SETTINGS_JSON);
if (MapUtils.isNotEmpty(appSettings)) {
updateLocalSettingValues(localSettingsFile, appSettings);
}
}

public static void prepareStagingFolder(Path stagingFolder, Path hostJson, Module module, PsiMethod[] methods) throws AzureExecutionException, IOException {
public static void prepareStagingFolder(Path stagingFolder, Path hostJson, Module module, PsiMethod[] methods)
throws AzureExecutionException, IOException {
final Map<String, FunctionConfiguration> configMap = generateConfigurations(methods);
if (stagingFolder.toFile().isDirectory()) {
FileUtils.cleanDirectory(stagingFolder.toFile());
Expand All @@ -195,7 +209,7 @@ public static void prepareStagingFolder(Path stagingFolder, Path hostJson, Modul
for (final Map.Entry<String, FunctionConfiguration> config : configMap.entrySet()) {
if (StringUtils.isNotBlank(config.getKey())) {
final File functionJsonFile = Paths.get(stagingFolder.toString(), config.getKey(), FUNCTION_JSON)
.toFile();
.toFile();
writeFunctionJsonFile(functionJsonFile, config.getValue());
}
}
Expand Down Expand Up @@ -231,7 +245,11 @@ public static String getTargetFolder(Module module) {
}
final Project project = module.getProject();
final MavenProject mavenProject = MavenProjectsManager.getInstance(project).findProject(module);
final String functionAppName = mavenProject == null ? null : mavenProject.getProperties().getProperty("functionAppName");
if (mavenProject == null) {
return StringUtils.EMPTY;
}
final String functionAppName = mavenProject == null ? null : mavenProject.getProperties().getProperty(
"functionAppName");
final String stagingFolderName = StringUtils.isEmpty(functionAppName) ? module.getName() : functionAppName;
return Paths.get(project.getBasePath(), "target", "azure-functions", stagingFolderName).toString();
}
Expand Down Expand Up @@ -278,7 +296,7 @@ private static Map<String, FunctionConfiguration> generateConfigurations(final P
final Map<String, FunctionConfiguration> configMap = new HashMap<>();
for (final PsiMethod method : methods) {
final PsiAnnotation annotation = AnnotationUtil.findAnnotation(method,
FunctionUtils.AZURE_FUNCTION_ANNOTATION_CLASS);
FunctionUtils.AZURE_FUNCTION_ANNOTATION_CLASS);
final PsiNameValuePair[] attributes = annotation.getParameterList().getAttributes();
String functionName = null;
for (final PsiNameValuePair attribute : attributes) {
Expand Down Expand Up @@ -330,10 +348,11 @@ private static List<Binding> parseAnnotations(JvmAnnotation[] annos) throws Azur
private static Binding getBinding(JvmAnnotation annotation) throws AzureExecutionException {
final BindingEnum annotationEnum = Arrays.stream(BindingEnum.values()).filter((bindingEnum) -> {
return bindingEnum.name().toLowerCase(Locale.ENGLISH)
.equals(FilenameUtils.getExtension(annotation.getQualifiedName()).toLowerCase(Locale.ENGLISH));
.equals(FilenameUtils.getExtension(annotation.getQualifiedName())
.toLowerCase(Locale.ENGLISH));
}).findFirst().orElse(null);
return annotationEnum == null ? getUserDefinedBinding(annotation)
: createBinding(annotationEnum, (PsiAnnotation) annotation);
: createBinding(annotationEnum, (PsiAnnotation) annotation);
}

private static Binding getUserDefinedBinding(JvmAnnotation annotation) {
Expand Down Expand Up @@ -361,14 +380,15 @@ private static Binding getHTTPOutBinding() {

private static void patchStorageBinding(final PsiMethod method, final List<Binding> bindings) {
final PsiAnnotation storageAccount = AnnotationUtil.findAnnotation(method,
StorageAccount.class.getCanonicalName());
StorageAccount.class.getCanonicalName());

if (storageAccount != null) {
System.out.println("StorageAccount annotation found.");
storageAccount.getAttributes().forEach(t -> {
if (t.getAttributeName().equals("value")) {
try {
final String connectionString = AnnotationHelper.getJvmAnnotationAttributeValue(t.getAttributeValue());
final String connectionString =
AnnotationHelper.getJvmAnnotationAttributeValue(t.getAttributeValue());
bindings.stream().filter(binding -> binding.getBindingEnum().isStorage())
.filter(binding -> StringUtils.isEmpty((String) binding.getAttribute("connection")))
.forEach(binding -> binding.setAttribute("connection", connectionString));
Expand All @@ -385,7 +405,8 @@ private static void patchStorageBinding(final PsiMethod method, final List<Bindi
}
}

private static Binding createBinding(BindingEnum bindingEnum, PsiAnnotation annotation) throws AzureExecutionException {
private static Binding createBinding(BindingEnum bindingEnum, PsiAnnotation annotation)
throws AzureExecutionException {
final Binding binding = new Binding(bindingEnum);
final PsiNameValuePair[] attributes = annotation.getParameterList().getAttributes();
for (final PsiNameValuePair attribute : attributes) {
Expand Down
6 changes: 4 additions & 2 deletions ...tellij/src/com/microsoft/intellij/runner/functions/localrun/FunctionRunConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,14 @@ public void setHostJsonPath(String hostJsonPath) {

@Override
public void validate() throws ConfigurationException {
if (getModel() == null) {
throw new ConfigurationException("Please specify module");
if (getModule() == null) {
throw new ConfigurationException("Please specify module or add Maven support to the project.");
}

if (StringUtils.isEmpty(getFuncPath())) {
throw new ConfigurationException("Please specify function cli path");
}

final File func = new File(getFuncPath());
if (!func.exists() || !func.isFile() || !func.getName().contains("func")) {
throw new ConfigurationException("Please specify correct function cli path");
Expand Down