Skip to content

Commit

Permalink
Added properties option.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ylussaud
ylussaud committed Feb 28, 2024
1 parent f3ee3e0 commit e4a9d33
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 43 deletions.
89 changes: 51 additions & 38 deletions query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/AQLUtils.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2023 Obeo.
* Copyright (c) 2023, 2024 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -11,6 +11,7 @@
package org.eclipse.acceleo.query;

import java.io.IOException;
import java.io.InputStream;
import java.io.LineNumberReader;
import java.io.StringReader;
import java.util.ArrayList;
Expand All @@ -21,6 +22,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.StringJoiner;

Expand All @@ -40,7 +42,6 @@
import org.eclipse.acceleo.query.parser.Positions;
import org.eclipse.acceleo.query.parser.QueryLexer;
import org.eclipse.acceleo.query.parser.QueryParser;
import org.eclipse.acceleo.query.runtime.IQueryEnvironment;
import org.eclipse.acceleo.query.runtime.IReadOnlyQueryEnvironment;
import org.eclipse.acceleo.query.runtime.IService;
import org.eclipse.acceleo.query.runtime.Query;
Expand All @@ -62,11 +63,13 @@
import org.eclipse.acceleo.query.validation.type.SetType;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
import org.eclipse.emf.ecore.util.EcoreUtil;

Expand Down Expand Up @@ -149,6 +152,11 @@ public int getEndPosition() {
*/
public static final String BASE_URI_OPTION = "BaseURI";

/**
* The install {@link ECrossReferenceAdapter} option.
*/
public static final String PROPERTIES_URIS_OPTION = "PropertiesURIs";

/**
* The AQL language name for {@link IServicesConfigurator}.
*/
Expand Down Expand Up @@ -690,41 +698,6 @@ private static List<IOptionProvider> getOptionProviders(String language) {
return res;
}

/**
* Creates a new {@link IQueryEnvironment} for the given language name and options.
*
* @param language
* the language name
* @param options
* the {@link Map} of options
* @param resourceSetForModels
* the {@link ResourceSet} for models
* @param forWorkspace
* tells if the {@link IService} will be used in a workspace
* @return a new {@link IQueryEnvironment} for the given language name and options
* @see #cleanServices(String, IReadOnlyQueryEnvironment, ResourceSet)
*/
public static IQueryEnvironment newEnvironmentWithDefaultServices(String language,
Map<String, String> options, ResourceSet resourceSetForModels, boolean forWorkspace) {
final ECrossReferenceAdapterCrossReferenceProvider crossReferenceProvider = new ECrossReferenceAdapterCrossReferenceProvider(
ECrossReferenceAdapter.getCrossReferenceAdapter(resourceSetForModels));
final ResourceSetRootEObjectProvider rootProvider = new ResourceSetRootEObjectProvider(
resourceSetForModels);
final IQueryEnvironment queryEnvironment = Query.newEnvironmentWithDefaultServices(
crossReferenceProvider, rootProvider);

for (IServicesConfigurator configurator : getServicesConfigurators(AQL_LANGUAGE)) {
ServiceUtils.registerServices(queryEnvironment, configurator.getServices(queryEnvironment,
resourceSetForModels, options, forWorkspace));
}
for (IServicesConfigurator configurator : getServicesConfigurators(language)) {
ServiceUtils.registerServices(queryEnvironment, configurator.getServices(queryEnvironment,
resourceSetForModels, options, forWorkspace));
}

return queryEnvironment;
}

/**
* Creates a new {@link IQualifiedNameQueryEnvironment} for the given language name and options.
*
Expand All @@ -746,9 +719,12 @@ public static IQualifiedNameQueryEnvironment newQualifiedNameEnvironmentDefaultS
ECrossReferenceAdapter.getCrossReferenceAdapter(resourceSetForModels));
final ResourceSetRootEObjectProvider rootProvider = new ResourceSetRootEObjectProvider(
resourceSetForModels);

final Properties properties = getProperties(resourceSetForModels.getURIConverter(), options);

final IQualifiedNameQueryEnvironment queryEnvironment = Query
.newQualifiedNameEnvironmentWithDefaultServices(resolver, crossReferenceProvider,
rootProvider, forWorkspace);
rootProvider, properties, forWorkspace);

for (IServicesConfigurator configurator : getServicesConfigurators(AQL_LANGUAGE)) {
ServiceUtils.registerServices(queryEnvironment, configurator.getServices(queryEnvironment,
Expand All @@ -762,6 +738,43 @@ public static IQualifiedNameQueryEnvironment newQualifiedNameEnvironmentDefaultS
return queryEnvironment;
}

/**
* Gets the {@link Properties} from the given options using the given {@link URIConverter}.
*
* @param uriConverter
* the {@link URIConverter}
* @param options
* the map of options
* @return the {@link Properties} from the given options using the given {@link URIConverter}
*/
private static Properties getProperties(final URIConverter uriConverter, Map<String, String> options) {
final Properties properties = new Properties();
final String propertiesURIsOption = options.get(PROPERTIES_URIS_OPTION);
if (propertiesURIsOption != null) {
final String[] uris = propertiesURIsOption.split(",");
final String baseURIString = options.get(BASE_URI_OPTION);
final URI baseURI;
if (baseURIString != null) {
baseURI = URI.createURI(baseURIString, true);
} else {
baseURI = null;
}
for (String uriString : uris) {
URI uri = URI.createURI(uriString, true);
if (uri.isRelative() && baseURI != null) {
uri = uri.resolve(baseURI);
}
try (final InputStream is = uriConverter.createInputStream(uri)) {
properties.load(is);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
return properties;
}

/**
* Cleans the services for the given language and {@link IReadOnlyQueryEnvironment}.
*
Expand Down
13 changes: 8 additions & 5 deletions query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/Query.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015, 2023 Obeo.
* Copyright (c) 2015, 2024 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -120,7 +120,7 @@ public static void configureEnvironment(IQueryEnvironment env, CrossReferencePro
* @param rootProvider
* an instance to search all instances at evaluation time
* @param properties
* the {@link Properties}
* the {@link Properties} used by the {@link PropertiesServices}
* @since 7.1
*/
public static void configureEnvironment(IQueryEnvironment env, CrossReferenceProvider xRefProvider,
Expand Down Expand Up @@ -197,7 +197,8 @@ public static IQueryEnvironment newEnvironment() {
*/
public static IQualifiedNameQueryEnvironment newQualifiedNameEnvironmentWithDefaultServices(
IQualifiedNameResolver resolver, CrossReferenceProvider xRefProvider) {
return newQualifiedNameEnvironmentWithDefaultServices(resolver, xRefProvider, null, false);
return newQualifiedNameEnvironmentWithDefaultServices(resolver, xRefProvider, null, new Properties(),
false);
}

/**
Expand All @@ -210,6 +211,8 @@ public static IQualifiedNameQueryEnvironment newQualifiedNameEnvironmentWithDefa
* an instance to inspect cross references at evaluation time
* @param rootProvider
* an instance to search all instances at evaluation time
* @param properties
* the {@link Properties} used be {@link PropertiesServices}
* @param forWorkspace
* tells if the {@link IService} will be used in a workspace
* @return a new {@link IQualifiedNameQueryEnvironment} configured with the services provided by default
Expand All @@ -218,10 +221,10 @@ public static IQualifiedNameQueryEnvironment newQualifiedNameEnvironmentWithDefa
*/
public static IQualifiedNameQueryEnvironment newQualifiedNameEnvironmentWithDefaultServices(
IQualifiedNameResolver resolver, CrossReferenceProvider xRefProvider,
IRootEObjectProvider rootProvider, boolean forWorkspace) {
IRootEObjectProvider rootProvider, Properties properties, boolean forWorkspace) {
final IQualifiedNameQueryEnvironment env = newQualifiedNameEnvironment(resolver);

configureEnvironment(env, xRefProvider, rootProvider, forWorkspace);
configureEnvironment(env, xRefProvider, rootProvider, properties, forWorkspace);

return env;
}
Expand Down

0 comments on commit e4a9d33

Please sign in to comment.