renames Datasets DatasetsAmqp/Cli -> Vlkb VlkbAmqp/Cli (c5adb876) · Commits · ViaLactea / vlkb-soda

data-access/servlet/src/main/java/cutout/Reproject.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -8,9 +8,9 @@ class Reproject implements Runnable
		String prefix;
		String fileName;
		String[] response;
		DatasetsAmqp datasets;
		VlkbAmqp datasets;

		public Reproject(DatasetsAmqp datasets, String id, String prefix, String fileName)
		public Reproject(VlkbAmqp datasets, String id, String prefix, String fileName)
		{
		this.datasets = datasets;
		this.id = id;
		@@ -23,9 +23,9 @@ class Reproject implements Runnable
		public void run()
		{
		String name = Thread.currentThread().getName();
		DatasetsAmqp.LOGGER.info("Start of " + name);
		VlkbAmqp.LOGGER.info("Start of " + name);
		response = datasets.mergefiles_reproject(id, prefix, fileName);
		DatasetsAmqp.LOGGER.info("End of " + name);
		VlkbAmqp.LOGGER.info("End of " + name);
		}

		}

data-access/servlet/src/main/java/cutout/Datasets.java→data-access/servlet/src/main/java/cutout/Vlkb.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ import java.time.Instant;//Timestamp in cut-filename

		import vo.parameter.*;

		public interface Datasets
		public interface Vlkb
		{
		public CutResult doFile(String relPathname, int hdunum,
		Pos pos, Band band, Time time, Pol pol, String pixels,

data-access/servlet/src/main/java/cutout/DatasetsAmqp.java→data-access/servlet/src/main/java/cutout/VlkbAmqp.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -27,30 +27,30 @@ import java.io.ByteArrayOutputStream; // for SODA direct streaming doSubimgStrea

		import vo.parameter.*;

		class DatasetsAmqp implements Datasets
		class VlkbAmqp implements Vlkb
		{
		static final Logger LOGGER = Logger.getLogger(DatasetsAmqp.class.getName());
		static final Logger LOGGER = Logger.getLogger("VlkbAmqp");

		private Settings settings = null;
		private Subsurvey[] subsurveys = null;

		public DatasetsAmqp()
		public VlkbAmqp()
		{
		LOGGER.info("trace DatasetsAmqp()");
		LOGGER.info("trace VlkbAmqp()");
		this.settings = Settings.getInstance();
		}


		public DatasetsAmqp(Settings settings)
		public VlkbAmqp(Settings settings)
		{
		LOGGER.info("trace DatasetsAmqp(settings)");
		LOGGER.info("trace VlkbAmqp(settings)");
		this.settings = settings;
		}


		public DatasetsAmqp(Settings settings, Subsurvey[] subsurveys)
		public VlkbAmqp(Settings settings, Subsurvey[] subsurveys)
		{
		LOGGER.info("trace DatasetsAmqp(settings, subsurveys)");
		LOGGER.info("trace VlkbAmqp(settings, subsurveys)");
		this.settings = settings;
		this.subsurveys = subsurveys;
		}
		@@ -345,7 +345,7 @@ class DatasetsAmqp implements Datasets
		LOGGER.info("mergefiles_parallel()");

		String[] responseCH = mergefiles_common_header(jobId, logfilename, prefix, filestomerge);
		for(String sentence : responseCH) DatasetsAmqp.LOGGER.info("responseCmnHdr: " + sentence);
		for(String sentence : responseCH) VlkbAmqp.LOGGER.info("responseCmnHdr: " + sentence);
		// check if response errored -> abort with 500: Internal Server Error & log details

		int threadsCount = filestomerge.length;
		@@ -377,7 +377,7 @@ class DatasetsAmqp implements Datasets
		}


		for(String sentence : reprojectArr[i].response) DatasetsAmqp.LOGGER.info("response[" + String.valueOf(i) + "]: " + sentence);
		for(String sentence : reprojectArr[i].response) VlkbAmqp.LOGGER.info("response[" + String.valueOf(i) + "]: " + sentence);
		if(!isResponseOk(reprojectArr[i].response))
		{
		;// FIXME response incorrect -> abort merge-job, free resources

data-access/servlet/src/main/java/cutout/DatasetsCli.java→data-access/servlet/src/main/java/cutout/VlkbCli.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -37,33 +37,33 @@ import org.json.simple.JSONArray;

		import vo.parameter.*;

		class DatasetsCli implements Datasets
		class VlkbCli implements Vlkb
		{
		static final Logger LOGGER = Logger.getLogger("DatasetsCli");
		static final Logger LOGGER = Logger.getLogger("VlkbCli");

		private Settings settings = null;
		private Subsurvey[] subsurveys = null;
		private Soda soda = null;

		public DatasetsCli()
		public VlkbCli()
		{
		LOGGER.info("trace DatasetsCli()");
		LOGGER.info("trace VlkbCli()");
		this.settings = Settings.getInstance();
		soda = new SodaImpl(settings, subsurveys);
		}


		public DatasetsCli(Settings settings)
		public VlkbCli(Settings settings)
		{
		LOGGER.info("trace DatasetsCli(settings)");
		LOGGER.info("trace VlkbCli(settings)");
		this.settings = settings;
		this.soda = new SodaImpl(settings, subsurveys);
		}


		public DatasetsCli(Settings settings, Subsurvey[] subsurveys)
		public VlkbCli(Settings settings, Subsurvey[] subsurveys)
		{
		LOGGER.info("trace DatasetsCli(settings, subsurveys)");
		LOGGER.info("trace VlkbCli(settings, subsurveys)");
		this.settings = settings;
		this.subsurveys = subsurveys;
		this.soda = new SodaImpl(settings, subsurveys);

data-access/servlet/src/main/java/webapi/ServletCutout.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ public class ServletCutout extends javax.servlet.http.HttpServlet
		private Subsurvey[] subsurveys = null;

		protected Soda soda = new SodaImpl(settings, subsurveys);
		protected Datasets datasets = ( settings.amqpConn.isHostnameEmpty() ? new DatasetsCli(settings): new DatasetsAmqp(settings) );
		protected Vlkb vlkb = ( settings.amqpConn.isHostnameEmpty() ? new VlkbCli(settings): new VlkbAmqp(settings) );

		public void init() throws ServletException
		{
		@@ -136,7 +136,7 @@ public class ServletCutout extends javax.servlet.http.HttpServlet
		{
		LOGGER.info("trace");

		return datasets.doFileById(id, pos, band, time, pol, pixels, countNullValues, subsurveys);
		return vlkb.doFileById(id, pos, band, time, pol, pixels, countNullValues, subsurveys);
		}