refactor(3scale-registry) Move some components into more logical locations.
MODIFY
distro/vertx/src/main/resources/overlay/configs/conf-immutable-3scale-es.json
distro/vertx/src/main/resources/overlay/configs/conf-immutable-3scale-es.json
// 3scale backend endpoint, this is the SaaS default. Alter this for on-prem deployment.
"backendEndpoint": "https://su1.3scale.net:443",
// Optional: Apiman policy overlay, allowing apiman custom policies to be applied to 3scale APIs.
- "policyConfig": {
- // Your overlay is a JSON document. Refer to docs for format information.
- "overlayUri": "file:///path/to/your/apiman-your-3scale-overlay.json",
- // For HTTP(S), BASIC and OAuth2 are supported. Refer to docs for more info.
- "auth": "NONE"
- },
+ // "policyConfig": {
+ // // Your overlay is a JSON document. Refer to docs for format information.
+ // "overlayUri": "file:///path/to/your/apiman-your-3scale-overlay.json",
+ // // For HTTP(S), BASIC and OAuth2 are supported. Refer to docs for more info.
+ // "auth": "NONE"
+ // },
// Which environment (e.g. production, staging). Default: production
"environment": "production",
// 3scale authrep strategy: STANDARD, BATCHED_HYBRID. Refer to docs for more.
"strategy": "STANDARD",
"defaultOrgName": "${3scale.defaultOrgName}",
- "defaultVersion": "${3scale.defaultVersion}",
+ "defaultVersion": "${3scale.defaultVersion}"
}
},

MODIFY
gateway/engine/3scale/src/main/java/io/apiman/gateway/engine/threescale/ThreeScaleImmutableRegistry.java
gateway/engine/3scale/src/main/java/io/apiman/gateway/engine/threescale/ThreeScaleImmutableRegistry.java
@@ -32,8 +32,8 @@ import io.apiman.gateway.engine.threescale.beans.ProxyConfigRoot;
import io.apiman.gateway.engine.threescale.beans.RateLimitingStrategy;
import io.apiman.gateway.engine.threescale.beans.Service;
import io.apiman.gateway.engine.threescale.beans.ServicesRoot;
+import io.apiman.gateway.engine.threescale.fetchers.AccessTokenResourceFetcher;
import io.apiman.gateway.engine.vertx.polling.PolicyConfigLoader;
-import io.apiman.gateway.engine.vertx.polling.fetchers.AccessTokenResourceFetcher;
import io.apiman.gateway.engine.vertx.polling.fetchers.FileResourceFetcher;
import io.apiman.gateway.engine.vertx.polling.fetchers.HttpResourceFetcher;
import io.apiman.gateway.engine.vertx.polling.fetchers.auth.AuthType;

RENAME
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/fetchers/AccessTokenResourceFetcher.java
gateway/engine/3scale/src/main/java/io/apiman/gateway/engine/threescale/fetchers/AccessTokenResourceFetcher.java
* limitations under the License.
*/
-package io.apiman.gateway.engine.vertx.polling.fetchers;
+package io.apiman.gateway.engine.threescale.fetchers;
import io.apiman.gateway.engine.vertx.polling.exceptions.BadResponseCodeError;
import io.vertx.core.Handler;

MODIFY
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/URILoadingRegistry.java
gateway/engine/vertx-polling/src/main/java/io/apiman/gateway/engine/vertx/polling/URILoadingRegistry.java
@@ -25,7 +25,6 @@ import io.apiman.gateway.engine.beans.Api;
import io.apiman.gateway.engine.beans.Client;
import io.apiman.gateway.engine.impl.InMemoryRegistry;
import io.apiman.gateway.engine.vertx.polling.exceptions.UnsupportedProtocolException;
-import io.apiman.gateway.engine.vertx.polling.fetchers.AccessTokenResourceFetcher;
import io.apiman.gateway.engine.vertx.polling.fetchers.FileResourceFetcher;
import io.apiman.gateway.engine.vertx.polling.fetchers.HttpResourceFetcher;
import io.apiman.gateway.engine.vertx.polling.fetchers.ResourceFetcher;
@@ -63,7 +62,6 @@ import org.apache.commons.lang3.StringUtils;
* @author Marc Savy {@literal <marc@rhymewithgravy.com>}
* @see FileResourceFetcher
* @see HttpResourceFetcher
- * @see AccessTokenResourceFetcher
*/
@SuppressWarnings("nls")
public class URILoadingRegistry extends InMemoryRegistry implements AsyncInitialize {

refactor(3scale-registry) Move some components into more logical locations.