Organize Nuxeo\Client\Api\Objects + code cleanup

Jenkinsfile

@@ -34,4 +34,4 @@ node('SLAVE') {
         step([$class: 'ClaimPublisher'])
         throw e
     }
-}
+}

README.md

@@ -107,8 +107,8 @@ $result = $operation->execute(Documents::className);
 ```
 
 ```php
-use Nuxeo\Client\Api\Objects\Blob;
-use Nuxeo\Client\Api\Objects\Blobs;
+use Nuxeo\Client\Api\Objects\Blob\Blob;
+use Nuxeo\Client\Api\Objects\Blob\Blobs;
 
 // To upload|download blob(s)
 

docker/nginx/nginx.conf

@@ -19,4 +19,4 @@ http {
   sendfile on;
 
   include /etc/nginx/conf.d/*.conf;
-}
+}

docker/nuxeo/nuxeo.defaults

@@ -1 +1 @@
-custom.target=.
+custom.target=.

docker/php-fpm/Dockerfile

@@ -15,4 +15,4 @@ RUN useradd -M -d /var/www/html -u 1000 -s /sbin/nologin php
 WORKDIR /var/www/html
 
 EXPOSE 9000
-CMD ["php-fpm"]
+CMD ["php-fpm"]

docker/qa/Dockerfile

@@ -12,4 +12,4 @@ RUN php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filenam
 
 ENV PATH=$PATH:vendor/bin
 
-RUN apt-get update && apt-get install -y nodejs-legacy git unzip
+RUN apt-get update && apt-get install -y nodejs-legacy git unzip

samples/B1.php

@@ -95,4 +95,4 @@
   <?php endif ?>
 </div>
 </body>
-</html>
+</html>

samples/B4.php

@@ -62,9 +62,9 @@
     try {
         if(null !== $document) {
             $client->automation('Blob.Attach')
-              ->input(\Nuxeo\Client\Api\Objects\Blob::fromFile($blob->getPathname(), $blob->getMimeType()))
+              ->input(\Nuxeo\Client\Api\Objects\Blob\Blob::fromFile($blob->getPathname(), $blob->getMimeType()))
               ->param('document', $document->getPath())
-              ->execute(\Nuxeo\Client\Api\Objects\Blob::className);
+              ->execute(\Nuxeo\Client\Api\Objects\Blob\Blob::className);
         }
     } catch(\Nuxeo\Client\Internals\Spi\NuxeoClientException $ex) {
         throw new RuntimeException('Could not attach blob to document: ' . $ex->getMessage());

samples/B5.php

@@ -26,11 +26,11 @@
     $path = $_POST['path'];
 
     try {
-        /** @var \Nuxeo\Client\Api\Objects\Blob $blob */
+        /** @var \Nuxeo\Client\Api\Objects\Blob\Blob $blob */
         $blob = $client
           ->automation('Blob.Get')
           ->input('doc:' . $path)
-          ->execute(\Nuxeo\Client\Api\Objects\Blob::className);
+          ->execute(\Nuxeo\Client\Api\Objects\Blob\Blob::className);
 
         $response = new \Symfony\Component\HttpFoundation\BinaryFileResponse($blob->getFile());
         $response->setContentDisposition(
@@ -75,4 +75,4 @@
     </form>
 </div>
 </body>
-</html>
+</html>

samples/samples.css

@@ -23,4 +23,4 @@ body {
 
 form {
     padding-bottom: 10px;
-}
+}

src/Nuxeo/Client/Api/Constants.php

@@ -40,5 +40,5 @@ class Constants {
   const ENTITY_TYPE_DOCUMENTS = 'documents';
 
   const ENTITY_TYPE_OPERATION = 'operation';
-  
+
 }

src/Nuxeo/Client/Api/Marshaller/AbstractJsonObjectMarshaller.php

@@ -57,4 +57,4 @@ public function write($object, VisitorInterface $visitor, SerializationContext $
     return $context->accept($object, $this->getType());
   }
 
-}
+}

src/Nuxeo/Client/Api/Marshaller/BlobMarshaller.php

@@ -47,4 +47,4 @@ public function write($object, VisitorInterface $visitor, SerializationContext $
     return null;
   }
 
-}
+}

src/Nuxeo/Client/Api/Marshaller/BlobsMarshaller.php

@@ -23,4 +23,4 @@
 
 class BlobsMarshaller extends BlobMarshaller {
 
-}
+}

src/Nuxeo/Client/Api/Marshaller/CounterListMarshaller.php

@@ -19,8 +19,8 @@
 namespace Nuxeo\Client\Api\Marshaller;
 
 
-use Nuxeo\Client\Api\Objects\Counter;
-use Nuxeo\Client\Api\Objects\CounterList;
+use Nuxeo\Client\Api\Objects\Operation\Counter;
+use Nuxeo\Client\Api\Objects\Operation\CounterList;
 
 class CounterListMarshaller extends AbstractJsonObjectMarshaller {
 

src/Nuxeo/Client/Api/Marshaller/CounterTimestampedValueMarshaller.php

@@ -19,7 +19,7 @@
 namespace Nuxeo\Client\Api\Marshaller;
 
 
-use Nuxeo\Client\Api\Objects\CounterTimestampedValue;
+use Nuxeo\Client\Api\Objects\Operation\CounterTimestampedValue;
 
 class CounterTimestampedValueMarshaller extends AbstractJsonObjectMarshaller {
 
@@ -31,4 +31,4 @@ protected function getClassName() {
     return CounterTimestampedValue::className;
   }
 
-}
+}

src/Nuxeo/Client/Api/Marshaller/DirectoryEntriesMarshaller.php

@@ -21,8 +21,8 @@
 namespace Nuxeo\Client\Api\Marshaller;
 
 
-use Nuxeo\Client\Api\Objects\DirectoryEntries;
-use Nuxeo\Client\Api\Objects\DirectoryEntry;
+use Nuxeo\Client\Api\Objects\Directory\DirectoryEntry;
+use Nuxeo\Client\Api\Objects\Operation\DirectoryEntries;
 
 class DirectoryEntriesMarshaller extends AbstractJsonObjectMarshaller {
 

src/Nuxeo/Client/Api/Marshaller/DocRefMarshaller.php

@@ -24,7 +24,7 @@
 use JMS\Serializer\DeserializationContext;
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\VisitorInterface;
-use Nuxeo\Client\Api\Objects\DocRef;
+use Nuxeo\Client\Api\Objects\Operation\DocRef;
 
 class DocRefMarshaller implements NuxeoMarshaller {
 
@@ -48,4 +48,4 @@ public function read($in, VisitorInterface $visitor, DeserializationContext $con
     return new DocRef($in);
   }
 
-}
+}

src/Nuxeo/Client/Api/Marshaller/NuxeoConverter.php

@@ -126,4 +126,4 @@ function(VisitorInterface $visitor, $object, array $type, DeserializationContext
     return $this->serializer;
   }
 
-}
+}

src/Nuxeo/Client/Api/Marshaller/NuxeoMarshaller.php

@@ -33,4 +33,4 @@ public function write($object, VisitorInterface $visitor, SerializationContext $
 
   const className = __CLASS__;
 
-}
+}

src/Nuxeo/Client/Api/NuxeoClient.php

@@ -35,11 +35,8 @@
 use Nuxeo\Client\Api\Marshaller\CounterTimestampedValueMarshaller;
 use Nuxeo\Client\Api\Marshaller\DirectoryEntriesMarshaller;
 use Nuxeo\Client\Api\Marshaller\NuxeoConverter;
-use Nuxeo\Client\Api\Objects\Blob;
-use Nuxeo\Client\Api\Objects\Blobs;
-use Nuxeo\Client\Api\Objects\CounterList;
-use Nuxeo\Client\Api\Objects\CounterTimestampedValue;
-use Nuxeo\Client\Api\Objects\DirectoryEntries;
+use Nuxeo\Client\Api\Objects\Blob\Blob;
+use Nuxeo\Client\Api\Objects\Blob\Blobs;
 use Nuxeo\Client\Api\Objects\Operation;
 use Nuxeo\Client\Internals\Spi\Auth\AuthenticationInterceptor;
 use Nuxeo\Client\Internals\Spi\Http\EntityEnclosingRequest;
@@ -218,9 +215,9 @@ public function getConverter() {
   protected function setupDefaultMarshallers() {
     $this->getConverter()->registerMarshaller(Blob::className, new BlobMarshaller());
     $this->getConverter()->registerMarshaller(Blobs::className, new BlobsMarshaller());
-    $this->getConverter()->registerMarshaller(CounterList::className, new CounterListMarshaller());
-    $this->getConverter()->registerMarshaller(CounterTimestampedValue::className, new CounterTimestampedValueMarshaller());
-    $this->getConverter()->registerMarshaller(DirectoryEntries::className, new DirectoryEntriesMarshaller());
+    $this->getConverter()->registerMarshaller(Operation\CounterList::className, new CounterListMarshaller());
+    $this->getConverter()->registerMarshaller(Operation\CounterTimestampedValue::className, new CounterTimestampedValueMarshaller());
+    $this->getConverter()->registerMarshaller(Operation\DirectoryEntries::className, new DirectoryEntriesMarshaller());
     return $this;
   }
 

src/Nuxeo/Client/Api/Objects/Blob.php → src/Nuxeo/Client/Api/Objects/Blob/Blob.php

@@ -14,19 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Contributors:
- *     Pierre-Gildas MILLON <pgmillon@nuxeo.com>
  */
 
-namespace Nuxeo\Client\Api\Objects;
-
+namespace Nuxeo\Client\Api\Objects\Blob;
 
 use Guzzle\Http\Message\Response;
+use Nuxeo\Client\Api\Objects\NuxeoEntity;
 use Nuxeo\Client\Internals\Spi\Http\Header\ContentDisposition;
 use Nuxeo\Client\Internals\Spi\NoSuchFileException;
 use Nuxeo\Client\Internals\Spi\NuxeoClientException;
 use Nuxeo\Client\Internals\Util\IOUtils;
 
+
 class Blob extends NuxeoEntity {
 
   const className = __CLASS__;
@@ -109,4 +108,4 @@ public function getFile() {
     return $this->file;
   }
 
-}
+}

src/Nuxeo/Client/Api/Objects/Blobs.php → src/Nuxeo/Client/Api/Objects/Blob/Blobs.php

@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Contributors:
- *     Pierre-Gildas MILLON <pgmillon@nuxeo.com>
  */
 
-namespace Nuxeo\Client\Api\Objects;
+namespace Nuxeo\Client\Api\Objects\Blob;
 
 use JMS\Serializer\Annotation as Serializer;
+use Nuxeo\Client\Api\Objects\NuxeoEntity;
 
 
 class Blobs extends NuxeoEntity implements \Countable {
@@ -60,4 +59,4 @@ public function add($blob) {
   public function count() {
     return count($this->blobs);
   }
-}
+}

src/Nuxeo/Client/Api/Objects/DirectoryEntry.php → src/Nuxeo/Client/Api/Objects/Directory/DirectoryEntry.php

@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Contributors:
- *     Pierre-Gildas MILLON <pgmillon@nuxeo.com>
  */
 
-namespace Nuxeo\Client\Api\Objects;
+namespace Nuxeo\Client\Api\Objects\Directory;
 
 
 use JMS\Serializer\Annotation as Serializer;
@@ -113,4 +111,4 @@ public function getLabel() {
     return $this->label;
   }
 
-}
+}

src/Nuxeo/Client/Api/Objects/Document.php

@@ -353,4 +353,4 @@ public function setProperties($properties) {
     $this->properties = $properties;
   }
 
-}
+}

src/Nuxeo/Client/Api/Objects/Documents.php

@@ -265,4 +265,4 @@ public function getPageCount() {
     return $this->pageCount;
   }
 
-}
+}

src/Nuxeo/Client/Api/Objects/NuxeoEntity.php

@@ -25,6 +25,7 @@
 use JMS\Serializer\Annotation as Serializer;
 use Nuxeo\Client\Api\Constants;
 use Nuxeo\Client\Api\NuxeoClient;
+use Nuxeo\Client\Api\Objects\Blob\Blob;
 use Nuxeo\Client\Internals\Spi\ClassCastException;
 
 abstract class NuxeoEntity {
@@ -81,4 +82,4 @@ protected function computeResponse($response, $type) {
     return $this->nuxeoClient->getConverter()->readJSON($body, $type);
   }
 
-}
+}

src/Nuxeo/Client/Api/Objects/Operation.php

@@ -25,6 +25,9 @@
 use JMS\Serializer\Annotation as Serializer;
 use Nuxeo\Client\Api\Constants;
 use Nuxeo\Client\Api\NuxeoClient;
+use Nuxeo\Client\Api\Objects\Blob\Blob;
+use Nuxeo\Client\Api\Objects\Blob\Blobs;
+use Nuxeo\Client\Api\Objects\Operation\OperationBody;
 use Nuxeo\Client\Internals\Spi\ClassCastException;
 use Nuxeo\Client\Internals\Spi\NoSuchOperationException;
 use Nuxeo\Client\Internals\Spi\NuxeoClientException;
@@ -160,4 +163,4 @@ protected function _doExecute($operationId) {
     return $response;
   }
 
-}
+}

src/Nuxeo/Client/Api/Objects/Counter.php → src/Nuxeo/Client/Api/Objects/Operation/Counter.php

@@ -16,7 +16,7 @@
  *
  */
 
-namespace Nuxeo\Client\Api\Objects;
+namespace Nuxeo\Client\Api\Objects\Operation;
 
 
 use JMS\Serializer\Annotation as Serializer;
@@ -27,19 +27,19 @@ class Counter {
 
   /**
    * @var CounterTimestampedValue[]
-   * @Serializer\Type("array<Nuxeo\Client\Api\Objects\CounterTimestampedValue>")
+   * @Serializer\Type("array<Nuxeo\Client\Api\Objects\Operation\CounterTimestampedValue>")
    */
   protected $values;
 
   /**
    * @var CounterTimestampedValue[]
-   * @Serializer\Type("array<Nuxeo\Client\Api\Objects\CounterTimestampedValue>")
+   * @Serializer\Type("array<Nuxeo\Client\Api\Objects\Operation\CounterTimestampedValue>")
    */
   protected $deltas;
 
   /**
    * @var CounterTimestampedValue[]
-   * @Serializer\Type("array<Nuxeo\Client\Api\Objects\CounterTimestampedValue>")
+   * @Serializer\Type("array<Nuxeo\Client\Api\Objects\Operation\CounterTimestampedValue>")
    */
   protected $speed;
 

src/Nuxeo/Client/Api/Objects/CounterList.php → src/Nuxeo/Client/Api/Objects/Operation/CounterList.php

@@ -16,7 +16,7 @@
  *
  */
 
-namespace Nuxeo\Client\Api\Objects;
+namespace Nuxeo\Client\Api\Objects\Operation;
 
 
 use JMS\Serializer\Annotation as Serializer;
@@ -25,4 +25,4 @@ class CounterList extends \ArrayObject {
 
   const className = __CLASS__;
 
-}
+}

src/Nuxeo/Client/Api/Objects/CounterTimestampedValue.php → src/Nuxeo/Client/Api/Objects/Operation/CounterTimestampedValue.php

@@ -16,7 +16,7 @@
  *
  */
 
-namespace Nuxeo\Client\Api\Objects;
+namespace Nuxeo\Client\Api\Objects\Operation;
 
 
 use JMS\Serializer\Annotation as Serializer;
@@ -57,4 +57,4 @@ public function getValue() {
     return $this->value;
   }
 
-}
+}