@@ -115,8 +115,7 @@ |
||
| 115 | 115 | { |
| 116 | 116 | $_aFilteredJobList[] = $_sJobName; |
| 117 | 117 | } |
| 118 | - } |
|
| 119 | - else |
|
| 118 | + } else |
|
| 120 | 119 | { |
| 121 | 120 | if (!$this->oJobIndexService->isJobInIndex($_sJobName)) |
| 122 | 121 | { |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | namespace Chapi\Service\JobValidator\PropertyValidator; |
| 11 | 11 | |
| 12 | 12 | |
| 13 | -use Chapi\Entity\Chronos\JobEntity; |
|
| 14 | 13 | use Chapi\Entity\JobEntityInterface; |
| 15 | 14 | use Chapi\Service\JobValidator\PropertyValidatorInterface; |
| 16 | 15 | |
@@ -54,8 +54,7 @@ |
||
| 54 | 54 | { |
| 55 | 55 | $_oResponse = $this->oGuzzelClient->request('GET', $sUrl, $_aRequestOptions); |
| 56 | 56 | return new HttpGuzzlResponse($_oResponse); |
| 57 | - } |
|
| 58 | - catch (\Exception $oException) |
|
| 57 | + } catch (\Exception $oException) |
|
| 59 | 58 | { |
| 60 | 59 | throw new HttpConnectionException( |
| 61 | 60 | sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
@@ -317,8 +317,7 @@ |
||
| 317 | 317 | { |
| 318 | 318 | $_oDateTime = new \DateTime(str_replace('Z', '', $_oIso8601Entity->sStartTime)); |
| 319 | 319 | $_oDateTime->setTimezone(new \DateTimeZone($sTimeZone)); |
| 320 | - } |
|
| 321 | - else |
|
| 320 | + } else |
|
| 322 | 321 | { |
| 323 | 322 | $_oDateTime = new \DateTime($_oIso8601Entity->sStartTime); |
| 324 | 323 | } |
@@ -99,10 +99,12 @@ |
||
| 99 | 99 | { |
| 100 | 100 | if ($this->oRepositoryBridge->addJob($oJobEntity)) |
| 101 | 101 | { |
| 102 | - if (!is_null($this->oJobCollection)) // if no collection inited the new job will init by chronos request |
|
| 102 | + if (!is_null($this->oJobCollection)) { |
|
| 103 | + // if no collection inited the new job will init by chronos request |
|
| 103 | 104 | { |
| 104 | 105 | $this->oJobCollection->offsetSet($oJobEntity->getKey(), $oJobEntity); |
| 105 | 106 | } |
| 107 | + } |
|
| 106 | 108 | |
| 107 | 109 | return true; |
| 108 | 110 | } |
@@ -55,8 +55,7 @@ |
||
| 55 | 55 | $_mValue = (!empty($_mValue)) |
| 56 | 56 | ? json_encode($_mValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) |
| 57 | 57 | : $_sEmptyString; |
| 58 | - } |
|
| 59 | - elseif (is_bool($_mValue)) |
|
| 58 | + } elseif (is_bool($_mValue)) |
|
| 60 | 59 | { |
| 61 | 60 | $_mValue = (true === $_mValue) |
| 62 | 61 | ? 'true' |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | |
| 13 | 13 | |
| 14 | 14 | use Chapi\BusinessCase\Comparison\JobComparisonInterface; |
| 15 | -use Chapi\Entity\JobEntityInterface; |
|
| 16 | 15 | use Chapi\Entity\Marathon\MarathonAppEntity; |
| 17 | 16 | use Chapi\Service\JobIndex\JobIndexServiceInterface; |
| 18 | 17 | use Chapi\Service\JobRepository\JobRepositoryInterface; |
@@ -83,8 +83,7 @@ |
||
| 83 | 83 | )); |
| 84 | 84 | return false; |
| 85 | 85 | } |
| 86 | - } |
|
| 87 | - catch(\Exception $e) |
|
| 86 | + } catch(\Exception $e) |
|
| 88 | 87 | { |
| 89 | 88 | $this->oLogger->error(sprintf( |
| 90 | 89 | 'Job %s cannot be added to remote : %s',$sAppId, $e->getMessage() |
@@ -12,8 +12,6 @@ |
||
| 12 | 12 | |
| 13 | 13 | use Chapi\Component\Cache\CacheInterface; |
| 14 | 14 | use Chapi\Component\RemoteClients\ApiClientInterface; |
| 15 | -use Chapi\Entity\Chronos\ChronosJobEntity; |
|
| 16 | -use Chapi\Entity\Marathon\MarathonAppEntity; |
|
| 17 | 15 | use Chapi\Service\JobValidator\JobValidatorServiceInterface; |
| 18 | 16 | use Psr\Log\LoggerInterface; |
| 19 | 17 | use Symfony\Component\Filesystem\Filesystem; |
@@ -155,8 +155,7 @@ discard block |
||
| 155 | 155 | DIRECTORY_SEPARATOR, |
| 156 | 156 | $oJobEntity->getKey() |
| 157 | 157 | ); |
| 158 | - } |
|
| 159 | - else |
|
| 158 | + } else |
|
| 160 | 159 | { |
| 161 | 160 | $_sJobPath = $oJobEntity->getKey(); |
| 162 | 161 | } |
@@ -268,15 +267,19 @@ discard block |
||
| 268 | 267 | |
| 269 | 268 | if ($_aTemp) |
| 270 | 269 | { |
| 271 | - if (property_exists($_aTemp, 'name')) // chronos |
|
| 270 | + if (property_exists($_aTemp, 'name')) { |
|
| 271 | + // chronos |
|
| 272 | 272 | { |
| 273 | 273 | $_aJobEntities[] = new ChronosJobEntity($_aTemp); |
| 274 | + } |
|
| 274 | 275 | |
| 275 | - } else if (property_exists($_aTemp, 'id')) //marathon |
|
| 276 | + } else if (property_exists($_aTemp, 'id')) { |
|
| 277 | + //marathon |
|
| 276 | 278 | { |
| 277 | 279 | foreach ($this->getMarathonEntitiesForConfig($_aTemp) as $_oApp) |
| 278 | 280 | { |
| 279 | 281 | $_aJobEntities[] = $_oApp; |
| 282 | + } |
|
| 280 | 283 | } |
| 281 | 284 | } else { |
| 282 | 285 | throw new JobLoadException( |
@@ -297,8 +300,7 @@ discard block |
||
| 297 | 300 | $_aJobs[] = $_oJobEntity; |
| 298 | 301 | } |
| 299 | 302 | |
| 300 | - } |
|
| 301 | - else |
|
| 303 | + } else |
|
| 302 | 304 | { |
| 303 | 305 | throw new JobLoadException( |
| 304 | 306 | sprintf('Unable to load json job data from "%s". Please check if the json is valid.', $_sJobFilePath), |
@@ -323,8 +325,7 @@ discard block |
||
| 323 | 325 | $this->aGroupedApps[] = $_oApp->id; |
| 324 | 326 | $_aRet[] = $_oGroupEntity; |
| 325 | 327 | } |
| 326 | - } |
|
| 327 | - else |
|
| 328 | + } else |
|
| 328 | 329 | { |
| 329 | 330 | $_aRet[] = new MarathonAppEntity($aEntityData); |
| 330 | 331 | } |