|
|
|
@ -16,6 +16,7 @@ import org.gcube.accounting.accounting.summary.access.AccountingDao;
|
|
|
|
|
import org.gcube.accounting.accounting.summary.access.model.ScopeDescriptor;
|
|
|
|
|
import org.gcube.accounting.accounting.summary.access.model.internal.Dimension;
|
|
|
|
|
import org.gcube.accounting.accounting.summary.access.model.update.AccountingRecord;
|
|
|
|
|
import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
|
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
|
|
|
|
import org.gcube.common.scope.impl.ScopeBean;
|
|
|
|
|
import org.gcube.common.scope.impl.ScopeBean.Type;
|
|
|
|
@ -78,7 +79,7 @@ public class AccountingDashboardHarvesterPlugin extends Plugin {
|
|
|
|
|
super();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private static final InheritableThreadLocal<Properties> properties = new InheritableThreadLocal<Properties>() {
|
|
|
|
|
private static final InheritableThreadLocal<Properties> configProperties = new InheritableThreadLocal<Properties>() {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
protected Properties initialValue() {
|
|
|
|
@ -87,8 +88,8 @@ public class AccountingDashboardHarvesterPlugin extends Plugin {
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
public static InheritableThreadLocal<Properties> getProperties() {
|
|
|
|
|
return properties;
|
|
|
|
|
public static InheritableThreadLocal<Properties> getConfigProperties() {
|
|
|
|
|
return configProperties;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public static Dimension getDimension(String key) {
|
|
|
|
@ -134,6 +135,7 @@ public class AccountingDashboardHarvesterPlugin extends Plugin {
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@JsonIgnore
|
|
|
|
|
public Properties getConfigParameters() throws IOException {
|
|
|
|
|
Properties properties = new Properties();
|
|
|
|
|
try {
|
|
|
|
@ -209,7 +211,7 @@ public class AccountingDashboardHarvesterPlugin extends Plugin {
|
|
|
|
|
DateUtils.format(end), reRun, getVREUsers, dryRun);
|
|
|
|
|
|
|
|
|
|
Properties properties = getConfigParameters();
|
|
|
|
|
getProperties().set(properties);
|
|
|
|
|
getConfigProperties().set(properties);
|
|
|
|
|
|
|
|
|
|
ContextAuthorization contextAuthorization = new ContextAuthorization();
|
|
|
|
|
|
|
|
|
|