From 385581f92863b38dbd609883a193185fb3d4f0cc Mon Sep 17 00:00:00 2001 From: Omar Sweidan Date: Wed, 3 Aug 2022 14:08:53 +0200 Subject: [PATCH] =?utf8?q?Elg=C3=A9pel=C3=A9s=20jav=C3=ADt=C3=A1sa?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../jobs/steps/PeableBeachMissingMaterialCheckerStep.java | 2 +- .../-product/production/AMC/jobs/steps/shared/PBQuery.java | 7 +++---- .../steps/PeableBeachMissingMaterialCheckerStep.java | 2 +- .../src/user/jobengine/server/steps/shared/PBQuery.java | 6 +++--- .../src/user/jobengine/server/JobEngineRemote.java | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java b/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java index 7f38fe98..5e22e1d7 100644 --- a/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java +++ b/server/-product/production/AMC/jobs/steps/PeableBeachMissingMaterialCheckerStep.java @@ -75,7 +75,7 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { PBQuery query = new PBQuery(); query.init(primaryEndPoint, primaryUserName, primaryPassword, secondaryEndPoint, secondaryUserName, secondaryPassword, rangeForwardHours); - Collection medias = query.getPossibelMissingMaterialNames(new ArrayList<>(poolContent)); + Collection medias = query.getPossibleMissingMaterialNames(new ArrayList<>(poolContent)); logger.info(getMarker(), "API returned {} items", medias == null ? 0 : medias.size()); if (medias != null && medias.size() > 0) { diff --git a/server/-product/production/AMC/jobs/steps/shared/PBQuery.java b/server/-product/production/AMC/jobs/steps/shared/PBQuery.java index b2727da2..b6cf146b 100644 --- a/server/-product/production/AMC/jobs/steps/shared/PBQuery.java +++ b/server/-product/production/AMC/jobs/steps/shared/PBQuery.java @@ -101,7 +101,6 @@ public class PBQuery { private String primaryPassword; private String secondaryEndPoint; private String secondaryUserName; - private String secondaryPassword; private int rangeForwardHours; @@ -119,7 +118,7 @@ public class PBQuery { return result; } - public Collection getPossibelMissingMaterialNames(List poolContent) throws Exception { + public Collection getPossibleMissingMaterialNames(List poolContent) throws Exception { Map result = querySortableMedias(poolContent); queryOtherMedias(poolContent, result); @@ -189,7 +188,7 @@ public class PBQuery { HttpEntity r_entity = response.getEntity(); // get response // Header[] headers = response.getAllHeaders(); // for (Header h : headers) { - // logger.info("Reponse Header", h.getName() + ": " + h.getValue()); + // logger.info("Response Header", h.getName() + ": " + h.getValue()); // } if (r_entity != null) { byte[] bytes = new byte[(int) r_entity.getContentLength()]; @@ -403,7 +402,7 @@ public class PBQuery { logger.info(this.subtitleMarker, "Successfully copied {}", target); break; } - logger.error(this.subtitleMarker, "Source {} and target {} content are not equals", source, target); + logger.error(this.subtitleMarker, "Source {} and target {} content are not equal", source, target); break; } } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java index 47f46053..8d085c16 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/PeableBeachMissingMaterialCheckerStep.java @@ -75,7 +75,7 @@ public class PeableBeachMissingMaterialCheckerStep extends JobStep { PBQuery query = new PBQuery(); query.init(primaryEndPoint, primaryUserName, primaryPassword, secondaryEndPoint, secondaryUserName, secondaryPassword, rangeForwardHours); - Collection medias = query.getPossibelMissingMaterialNames(new ArrayList<>(poolContent)); + Collection medias = query.getPossibleMissingMaterialNames(new ArrayList<>(poolContent)); logger.info(getMarker(), "API returned {} items", medias == null ? 0 : medias.size()); if (medias != null && medias.size() > 0) { diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java index 7218c1a7..142361c3 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/shared/PBQuery.java @@ -119,7 +119,7 @@ public class PBQuery { return result; } - public Collection getPossibelMissingMaterialNames(List poolContent) throws Exception { + public Collection getPossibleMissingMaterialNames(List poolContent) throws Exception { Map result = querySortableMedias(poolContent); queryOtherMedias(poolContent, result); @@ -188,7 +188,7 @@ public class PBQuery { HttpEntity r_entity = response.getEntity(); // get response // Header[] headers = response.getAllHeaders(); // for (Header h : headers) { - // logger.info("Reponse Header", h.getName() + ": " + h.getValue()); + // logger.info("Response Header", h.getName() + ": " + h.getValue()); // } if (r_entity != null) { byte[] bytes = new byte[(int) r_entity.getContentLength()]; @@ -402,7 +402,7 @@ public class PBQuery { logger.info(this.subtitleMarker, "Successfully copied {}", target); break; } - logger.error(this.subtitleMarker, "Source {} and target {} content are not equals", source, target); + logger.error(this.subtitleMarker, "Source {} and target {} content are not equal", source, target); break; } } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineRemote.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineRemote.java index 76ee4458..7486077e 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineRemote.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngineRemote.java @@ -59,7 +59,7 @@ public class JobEngineRemote { //response = target.request().post(Entity.entity(mapper.writeValueAsString(job), MediaType.APPLICATION_JSON)); response = target.request().post(Entity.entity(job, MediaType.APPLICATION_JSON)); if (Status.OK.getStatusCode() != response.getStatus()) - throw new Exception("Unexpected reponse occured"); + throw new Exception("Unexpected response occured"); } catch (Exception e) { logger.error(e.getMessage()); } finally { -- 2.54.0