@@ -46,9 +46,9 @@ |
||
46 | 46 | |
47 | 47 | |
48 | 48 | /** |
49 | - * @param JobRepositoryInterface $oJobRepositoryLocal |
|
49 | + * @param JobRepositoryInterface $oJobRepositoryLocalChronos |
|
50 | 50 | * @param JobRepositoryInterface $oJobRepositoryChronos |
51 | - * @param JobRepositoryInterface $oJobRepositoryMarathon |
|
51 | + * @param JobRepositoryInterface $oJobRepositoryLocalChronos |
|
52 | 52 | * @param DiffCompareInterface $oDiffCompare |
53 | 53 | * @param DatePeriodFactoryInterface $oDatePeriodFactory |
54 | 54 | * @param LoggerInterface $oLogger |
@@ -11,8 +11,8 @@ |
||
11 | 11 | |
12 | 12 | use Chapi\Component\Comparison\DiffCompareInterface; |
13 | 13 | use Chapi\Component\DatePeriod\DatePeriodFactoryInterface; |
14 | -use Chapi\Entity\Chronos\JobCollection; |
|
15 | 14 | use Chapi\Entity\Chronos\ChronosJobEntity; |
15 | +use Chapi\Entity\Chronos\JobCollection; |
|
16 | 16 | use Chapi\Entity\JobEntityInterface; |
17 | 17 | use Chapi\Service\JobRepository\JobRepositoryInterface; |
18 | 18 | use Psr\Log\LoggerInterface; |
@@ -15,8 +15,6 @@ |
||
15 | 15 | use Chapi\Entity\Chronos\ChronosJobEntity; |
16 | 16 | use Chapi\Entity\Chronos\JobCollection; |
17 | 17 | use Chapi\Entity\JobEntityInterface; |
18 | -use Chapi\Entity\Marathon\AppEntity\FetchUrl; |
|
19 | -use Chapi\Entity\Marathon\AppEntity\PortDefinition; |
|
20 | 18 | use Chapi\Entity\Marathon\MarathonAppEntity; |
21 | 19 | use Chapi\Service\JobRepository\JobRepositoryInterface; |
22 | 20 |
@@ -150,6 +150,9 @@ discard block |
||
150 | 150 | return !(count($arr) == count(array_unique($arr))); |
151 | 151 | } |
152 | 152 | |
153 | + /** |
|
154 | + * @param integer $immediateChildren |
|
155 | + */ |
|
153 | 156 | private function isDependencyCircular(JobEntityInterface $oEntity, $immediateChildren, &$path=[]) |
154 | 157 | { |
155 | 158 | // Invariant: path will not have duplicates for acyclic dependency tree |
@@ -310,6 +313,9 @@ discard block |
||
310 | 313 | } |
311 | 314 | } |
312 | 315 | |
316 | + /** |
|
317 | + * @param boolean $bForceOverwrite |
|
318 | + */ |
|
313 | 319 | private function updateJobInLocalRepository($oAppRemote, $bForceOverwrite) |
314 | 320 | { |
315 | 321 | $_aDiff = $this->oJobComparisionBusinessCase->getJobDiff($oAppRemote->getKey()); |
@@ -16,7 +16,7 @@ |
||
16 | 16 | /** |
17 | 17 | * @param StoreJobBusinessCaseInterface $oStoreJob |
18 | 18 | * @return |
19 | - */ |
|
19 | + void |
|
20 | 20 | public function addBusinesCase(StoreJobBusinessCaseInterface $oStoreJob); |
21 | 21 | |
22 | 22 | /** |
@@ -11,7 +11,6 @@ |
||
11 | 11 | |
12 | 12 | use Chapi\Entity\Chronos\ChronosJobEntity; |
13 | 13 | use Chapi\Entity\JobEntityInterface; |
14 | -use Chapi\Entity\Marathon\MarathonAppEntity; |
|
15 | 14 | use Chapi\Service\JobRepository\JobRepositoryInterface; |
16 | 15 | use Symfony\Component\Console\Helper\Table; |
17 | 16 | use Symfony\Component\Console\Input\InputOption; |
@@ -11,8 +11,8 @@ |
||
11 | 11 | namespace Chapi\Component\RemoteClients; |
12 | 12 | |
13 | 13 | |
14 | -use Chapi\Component\RemoteClients\ApiClientInterface; |
|
15 | 14 | use Chapi\Component\Http\HttpClientInterface; |
15 | +use Chapi\Component\RemoteClients\ApiClientInterface; |
|
16 | 16 | use Chapi\Entity\Chronos\ChronosJobEntity; |
17 | 17 | use Chapi\Entity\JobEntityInterface; |
18 | 18 | use Chapi\Exception\ApiClientException; |
@@ -9,13 +9,11 @@ |
||
9 | 9 | |
10 | 10 | namespace Chapi\Entity\Marathon; |
11 | 11 | |
12 | -use Chapi\Entity\Marathon\AppEntity; |
|
13 | 12 | use Chapi\Entity\Marathon\AppEntity\Container; |
14 | 13 | use Chapi\Entity\Marathon\AppEntity\FetchUrl; |
15 | 14 | use Chapi\Entity\Marathon\AppEntity\HealthCheck; |
16 | 15 | use Chapi\Entity\Marathon\AppEntity\PortDefinition; |
17 | 16 | use Chapi\Entity\Marathon\AppEntity\UpgradeStrategy; |
18 | -use SebastianBergmann\Comparator\ExceptionComparatorTest; |
|
19 | 17 | |
20 | 18 | class AppSubEntityFactory implements AppSubEntityFactoryInterface |
21 | 19 | { |
@@ -347,6 +347,9 @@ |
||
347 | 347 | } |
348 | 348 | |
349 | 349 | |
350 | + /** |
|
351 | + * @param string $sJobFile |
|
352 | + */ |
|
350 | 353 | private function dumpFileWithGroup($sJobFile, JobEntityInterface $oJobEntity, $bAdd = true) |
351 | 354 | { |
352 | 355 | $_sGroupConfig = file_get_contents($sJobFile); |
@@ -11,7 +11,6 @@ |
||
11 | 11 | |
12 | 12 | use Chapi\Component\Cache\CacheInterface; |
13 | 13 | use Chapi\Component\RemoteClients\ApiClientInterface; |
14 | -use Chapi\Entity\Chronos\ChronosJobEntity; |
|
15 | 14 | use Chapi\Entity\JobEntityInterface; |
16 | 15 | use Chapi\Entity\Marathon\MarathonAppEntity; |
17 | 16 | use Chapi\Service\JobValidator\JobValidatorServiceInterface; |