Compare commits

...

1 Commits

4 changed files with 2 additions and 5 deletions

View File

@ -8,7 +8,7 @@
</parent>
<groupId>org.gcube.application</groupId>
<artifactId>perform-service</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
<name>Perform Service</name>
<description>Service for Farm Perform Data Management</description>
<packaging>war</packaging>

View File

@ -212,7 +212,6 @@ public class PerformanceManagerImpl implements PerformanceManager{
DBQueryDescriptor desc=new DBQueryDescriptor().
add(DBField.ImportRoutine.fields.get(ImportRoutine.FARM_ID),last.getFarmId()).
add(DBField.ImportRoutine.fields.get(ImportRoutine.BATCH_TYPE),last.getBatch_type()).
add(DBField.ImportRoutine.fields.get(ImportRoutine.SOURCE_URL),last.getSourceUrl()).
add(DBField.ImportRoutine.fields.get(ImportRoutine.ID),last.getId()).
add(DBField.ImportRoutine.fields.get(ImportRoutine.END),new Timestamp(Instant.now().toEpochMilli()));

View File

@ -41,13 +41,11 @@ public class Queries {
public static final Query GET_OLDER_EQUIVALENT_IMPORT_ROUTINE=new Query("Select * from "+ImportRoutine.TABLE+" WHERE "
+ImportRoutine.FARM_ID+"=? AND "
+ImportRoutine.BATCH_TYPE+"=? AND "
+ImportRoutine.SOURCE_URL+"=? AND "
+ImportRoutine.ID+"<>? AND "
+"("+ImportRoutine.END+"<? OR "+ImportRoutine.END+" IS NULL) ",
new DBField[]{
DBField.ImportRoutine.fields.get(ImportRoutine.FARM_ID),
DBField.ImportRoutine.fields.get(ImportRoutine.BATCH_TYPE),
DBField.ImportRoutine.fields.get(ImportRoutine.SOURCE_URL),
DBField.ImportRoutine.fields.get(ImportRoutine.ID),
DBField.ImportRoutine.fields.get(ImportRoutine.END)});

View File

@ -20,7 +20,7 @@ public class CommonTest extends JerseyTest{
@BeforeClass
public static void init() throws IOException, SQLException, InternalException {
LocalConfiguration.init(Paths.get("src/main/webapp/WEB-INF/config.properties").toUri().toURL());
TokenSetter.set("/gcube/preprod/preVRE");
TokenSetter.set("/pred4s/preprod/preVRE");
ISUtils.setFixedToken(SecurityTokenProvider.instance.get());
PerformServiceLifecycleManager.initSchema("src/main/webapp/WEB-INF");