add multi-gateways support to api command and plan support to declarative command

.travis.yml

@@ -5,7 +5,7 @@ jdk:
 services:
   - docker
 before_install:
- - docker pull apiman/on-wildfly10:1.2.4.Final
+ - docker pull apiman/on-wildfly10:1.2.8.Final
 script:
- - docker run -d -p 8080:8080 apiman/on-wildfly10:1.2.4.Final
- - ./gradlew test -PintegrationTest --info
+ - docker run -d -p 8080:8080 apiman/on-wildfly10:1.2.8.Final
+ - ./gradlew test -PintegrationTest --info --stacktrace

CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Added
+- Adds the ability to wait for the server to start before attempting to run commands.
+- Improvements to internal code structure.
+
 ## [0.2.3] - 2016-09-22
 ### Added
 - Adds support for multiple versions of an API in the same declaration file.

README.md

@@ -60,7 +60,7 @@ Here's how it works:
 
 Here's a simple YAML file (you can use JSON if you want):
 
-    # simple.yml
+    # simpleApi.yml
     ---
     org:
       name: "test"
@@ -73,17 +73,34 @@ Here's a simple YAML file (you can use JSON if you want):
           config:
             endpoint: "http://example.com"
             endpointType: "rest"
-            public: true
+            public: false
             gateway: "TheGateway"
+            plans:
+              - planId: "planExample"
+                version: "1.0"
           policies:
             - name: "CachingPolicy"
               config:
                 ttl: 60
 
+    # simplePlan.yml
+    ---
+    org:
+      name: "test"
+      description: "Test organisation"
+      plans:
+        - name: "planExample"
+          description: "This is a plan"
+          version: "1.0"
+          policies:
+            - name: "CachingPolicy"
+              config:
+                ttl: 120
+
 ### Step 2: Apply the environment declaration
 
-    $ ./apiman apply -f simple.yml
-    INFO Loaded declaration: examples/declarative/simple.yml
+    $ ./apiman apply -f simpleApi.yml
+    INFO Loaded declaration: examples/declarative/simpleApi.yml
     INFO Adding org: test
     INFO Adding API: example
     INFO Configuring API: example

build.gradle

@@ -15,7 +15,7 @@
  */
 
 group 'io.apiman.cli'
-version '0.2.3'
+version '0.2.4-SNAPSHOT'
 
 buildscript {
     repositories {
@@ -38,6 +38,7 @@ repositories {
 
 compileJava {
     sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
 }
 
 ext {

gradle/wrapper/gradle-wrapper.properties

@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

src/main/java/io/apiman/cli/Cli.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 Pete Cornish
+ * Copyright 2017 Pete Cornish
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,14 +17,17 @@
 package io.apiman.cli;
 
 import com.google.common.collect.Lists;
-import io.apiman.cli.command.AbstractCommand;
-import io.apiman.cli.command.Command;
-import io.apiman.cli.core.api.command.ApiCommand;
-import io.apiman.cli.core.declarative.command.ApplyCommand;
-import io.apiman.cli.core.gateway.command.GatewayCommand;
-import io.apiman.cli.core.org.command.OrgCommand;
-import io.apiman.cli.core.plugin.command.PluginCommand;
+import io.apiman.cli.command.api.command.ApiCommand;
+import io.apiman.cli.command.core.AbstractCommand;
+import io.apiman.cli.command.core.Command;
+import io.apiman.cli.command.declarative.command.ApplyCommand;
+import io.apiman.cli.command.gateway.command.GatewayCommand;
+import io.apiman.cli.command.org.command.OrgCommand;
+import io.apiman.cli.command.plugin.command.PluginCommand;
+import io.apiman.cli.service.ManagementApiService;
+import io.apiman.cli.util.InjectionUtil;
 
+import javax.inject.Inject;
 import java.util.Map;
 
 /**
@@ -33,8 +36,13 @@
  * @author Pete Cornish {@literal <outofcoffee@gmail.com>}
  */
 public class Cli extends AbstractCommand {
+    @Inject
+    public Cli(ManagementApiService managementApiService) {
+        super(managementApiService);
+    }
+
     public static void main(String... args) {
-        new Cli().run(Lists.newArrayList(args));
+        InjectionUtil.getInjector().getInstance(Cli.class).run(Lists.newArrayList(args));
     }
 
     @Override

src/main/java/io/apiman/cli/core/api/ApiMixin.java → src/main/java/io/apiman/cli/command/api/ApiMixin.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 Pete Cornish
+ * Copyright 2017 Pete Cornish
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.apiman.cli.core.api;
+package io.apiman.cli.command.api;
 
-import io.apiman.cli.core.common.command.ModelAction;
-import io.apiman.cli.core.api.model.Api;
+import io.apiman.cli.command.api.model.Api;
+import io.apiman.cli.command.common.command.ModelAction;
 
 /**
  * @author Pete Cornish {@literal <outofcoffee@gmail.com>}

src/main/java/io/apiman/cli/core/api/Version11xServerApi.java → src/main/java/io/apiman/cli/command/api/Version11xServerApi.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 Pete Cornish
+ * Copyright 2017 Pete Cornish
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.apiman.cli.core.api;
+package io.apiman.cli.command.api;
 
-import io.apiman.cli.core.api.model.Api;
-import io.apiman.cli.core.api.model.ApiPolicy;
-import io.apiman.cli.core.api.model.ApiVersion;
-import io.apiman.cli.core.api.model.ServiceConfig;
+import io.apiman.cli.command.api.model.Api;
+import io.apiman.cli.command.api.model.ApiPolicy;
+import io.apiman.cli.command.api.model.ApiVersion;
+import io.apiman.cli.command.api.model.ServiceConfig;
 import retrofit.client.Response;
 import retrofit.http.*;
 
@@ -46,6 +46,9 @@ public interface Version11xServerApi {
     @GET("/organizations/{orgName}/services/{serviceName}/versions/{version}")
     Api fetchVersion(@Path("orgName") String orgName, @Path("serviceName") String serviceName, @Path("version") String version);
 
+    @GET("/organizations/{orgName}/services/{serviceName}/versions")
+    List<Api> fetchVersions(@Path("orgName") String orgName, @Path("serviceName") String serviceName);
+
     @PUT("/organizations/{orgName}/services/{serviceName}/versions/{version}")
     Response configure(@Path("orgName") String orgName, @Path("serviceName") String serviceName,
                        @Path("version") String version, @Body ServiceConfig config);
@@ -58,6 +61,10 @@ Response addPolicy(@Path("orgName") String orgName, @Path("serviceName") String
     List<ApiPolicy> fetchPolicies(@Path("orgName") String orgName, @Path("serviceName") String serviceName,
                                   @Path("version") String version);
 
+    @GET("/organizations/{orgName}/services/{serviceName}/versions/{version}/policies/{policyId}")
+    ApiPolicy fetchPolicy(@Path("orgName") String orgName, @Path("serviceName") String serviceName,
+                                  @Path("version") String version, @Path("policyId") Long policyId);
+
     @PUT("/organizations/{orgName}/services/{serviceName}/versions/{version}/policies/{policyId}")
     Response configurePolicy(@Path("orgName") String orgName, @Path("serviceName") String serviceName,
                              @Path("version") String version, @Path("policyId") Long policyId, @Body ApiPolicy policyConfig);

src/main/java/io/apiman/cli/core/api/Version12xServerApi.java → src/main/java/io/apiman/cli/command/api/Version12xServerApi.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 Pete Cornish
+ * Copyright 2017 Pete Cornish
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.apiman.cli.core.api;
+package io.apiman.cli.command.api;
 
-import io.apiman.cli.core.api.model.Api;
-import io.apiman.cli.core.api.model.ApiConfig;
-import io.apiman.cli.core.api.model.ApiPolicy;
-import io.apiman.cli.core.api.model.ApiVersion;
+import io.apiman.cli.command.api.model.Api;
+import io.apiman.cli.command.api.model.ApiConfig;
+import io.apiman.cli.command.api.model.ApiPolicy;
+import io.apiman.cli.command.api.model.ApiVersion;
 import retrofit.client.Response;
 import retrofit.http.*;
 
@@ -46,6 +46,9 @@ public interface Version12xServerApi {
     @GET("/organizations/{orgName}/apis/{apiName}/versions/{version}")
     Api fetchVersion(@Path("orgName") String orgName, @Path("apiName") String apiName, @Path("version") String version);
 
+    @GET("/organizations/{orgName}/apis/{apiName}/versions")
+    List<Api> fetchVersions(@Path("orgName") String orgName, @Path("apiName") String apiName);
+
     @PUT("/organizations/{orgName}/apis/{apiName}/versions/{version}")
     Response configure(@Path("orgName") String orgName, @Path("apiName") String apiName,
                        @Path("version") String version, @Body ApiConfig config);
@@ -58,6 +61,10 @@ Response addPolicy(@Path("orgName") String orgName, @Path("apiName") String apiN
     List<ApiPolicy> fetchPolicies(@Path("orgName") String orgName, @Path("apiName") String apiName,
                                   @Path("version") String version);
 
+    @GET("/organizations/{orgName}/apis/{apiName}/versions/{version}/policies/{policyId}")
+    ApiPolicy fetchPolicy(@Path("orgName") String orgName, @Path("apiName") String apiName,
+                                  @Path("version") String version, @Path("policyId") Long policyId);
+
     @PUT("/organizations/{orgName}/apis/{apiName}/versions/{version}/policies/{policyId}")
     Response configurePolicy(@Path("orgName") String orgName, @Path("apiName") String apiName,
                              @Path("version") String version, @Path("policyId") Long policyId, @Body ApiPolicy policyConfig);

src/main/java/io/apiman/cli/core/api/VersionAgnosticApi.java → src/main/java/io/apiman/cli/command/api/VersionAgnosticApi.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Pete Cornish
+ * Copyright 2017 Pete Cornish
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.apiman.cli.core.api;
+package io.apiman.cli.command.api;
 
-import io.apiman.cli.core.api.model.Api;
-import io.apiman.cli.core.api.model.ApiConfig;
-import io.apiman.cli.core.api.model.ApiPolicy;
-import io.apiman.cli.core.api.model.ApiVersion;
+import io.apiman.cli.command.api.model.ApiPolicy;
+import io.apiman.cli.command.api.model.Api;
+import io.apiman.cli.command.api.model.ApiConfig;
+import io.apiman.cli.command.api.model.ApiVersion;
 import retrofit.client.Response;
 
 import java.util.List;
@@ -38,15 +38,20 @@ public interface VersionAgnosticApi {
 
     Api fetchVersion(String orgName, String apiName, String version);
 
+    List<Api> fetchVersions(String orgName, String apiName);
+
     Response configure(String orgName, String apiName,
                        String version, ApiConfig config);
 
     Response addPolicy(String orgName, String apiName,
                        String version, ApiPolicy policyConfig);
 
-    List<ApiPolicy> fetchPolicies(String orgName, String serviceName,
+    List<ApiPolicy> fetchPolicies(String orgName, String apiName,
                                   String version);
 
+    ApiPolicy fetchPolicy(String orgName, String apiName,
+                                  String version, Long policyId);
+
     Response configurePolicy(String orgName, String apiName,
                              String apiVersion, Long policyId, ApiPolicy policyConfig);
 }

src/main/java/io/apiman/cli/core/api/command/AbstractApiCommand.java → src/main/java/io/apiman/cli/command/api/command/AbstractApiCommand.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 Pete Cornish
+ * Copyright 2017 Pete Cornish
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package io.apiman.cli.core.api.command;
+package io.apiman.cli.command.api.command;
 
-import io.apiman.cli.core.common.command.AbstractModelCommand;
-import io.apiman.cli.core.api.Version12xServerApi;
-import io.apiman.cli.core.api.ApiMixin;
-import io.apiman.cli.core.api.model.Api;
-import io.apiman.cli.core.common.model.ManagementApiVersion;
+import io.apiman.cli.command.common.command.AbstractModelCommand;
+import io.apiman.cli.command.api.Version12xServerApi;
+import io.apiman.cli.command.api.ApiMixin;
+import io.apiman.cli.command.api.model.Api;
+import io.apiman.cli.command.common.model.ManagementApiVersion;
+import io.apiman.cli.service.ManagementApiService;
 import org.kohsuke.args4j.Option;
 
 /**
@@ -34,4 +35,8 @@ public abstract class AbstractApiCommand extends AbstractModelCommand<Api, Versi
 
     @Option(name = "--serverVersion", aliases = {"-sv"}, usage = "Management API server version")
     protected ManagementApiVersion serverVersion = ManagementApiVersion.DEFAULT_VERSION;
+
+    AbstractApiCommand(ManagementApiService managementApiService) {
+        super(managementApiService);
+    }
 }