diff --git a/AGENTS.md b/AGENTS.md index 7a0e7b924..2ffc86677 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -173,7 +173,7 @@ describes. The cloud examples need a resource key, which a person creates in the configurator, so ask for one if none is set. A key with the properties most of the Device Detection examples use can be made -[here](https://configure.51degrees.com/jqz435Nc?utm_source=github&utm_medium=docs&utm_campaign=51degrees-java&utm_content=agents.md&utm_term=cloud-examples). +[here](https://51degrees.com/configure/jqz435Nc?utm_source=github&utm_medium=docs&utm_campaign=51degrees-java&utm_content=agents.md&utm_term=cloud-examples). The Device Detection cloud example takes the key as its first argument, or from a `TestResourceKey` environment variable or system property. diff --git a/README.md b/README.md index df1cd6427..eb3994a5a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Each product is a separate Maven Central package. For Device Detection, cloud or The product guides below list the other packages. To build from source, see [Getting the code](#getting-the-code). -Try the [User-Agent tester](https://51degrees.com/developers/user-agent-tester?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=install) and [IP tester](https://51degrees.com/developers/ip-tester?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=install). For cloud use, [create a Resource Key](https://configure.51degrees.com/?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=install). +Try the [User-Agent tester](https://51degrees.com/developers/user-agent-tester?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=install) and [IP tester](https://51degrees.com/developers/ip-tester?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=install). For cloud use, [create a Resource Key](https://51degrees.com/configure/?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=install). Created from `pipeline-java`, `device-detection-java`, `ip-intelligence-java`, `location-java`, `device-detection-java-examples`, and `ip-intelligence-java-examples`, this repository continues their work. diff --git a/device-detection/README.md b/device-detection/README.md index f1e0a9e9e..713872bc5 100644 --- a/device-detection/README.md +++ b/device-detection/README.md @@ -22,7 +22,7 @@ The Java API can either use our cloud service to get its data or it can use a lo You will require [resource keys](https://51degrees.com/documentation/_services__cloud__resource_keys.html?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud) to use the Cloud API, as described on our website. Get resource keys from -our [configurator](https://configure.51degrees.com/?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud), see our [documentation](https://51degrees.com/documentation/_services__configurator.html?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud) on +our [configuration page](https://51degrees.com/configure/?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud), see our [documentation](https://51degrees.com/documentation/_services__configurator.html?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud) on how to use this. #### On-Premise diff --git a/device-detection/device-detection/src/main/java/fiftyone/devicedetection/DeviceDetectionPipelineBuilder.java b/device-detection/device-detection/src/main/java/fiftyone/devicedetection/DeviceDetectionPipelineBuilder.java index 8985dfd27..6e025c28b 100644 --- a/device-detection/device-detection/src/main/java/fiftyone/devicedetection/DeviceDetectionPipelineBuilder.java +++ b/device-detection/device-detection/src/main/java/fiftyone/devicedetection/DeviceDetectionPipelineBuilder.java @@ -145,7 +145,7 @@ public DeviceDetectionOnPremisePipelineBuilder useOnPremise( /** * Use the 51Degrees Cloud service to perform device detection. * @param resourceKey The resource key to use when querying the cloud service. - * Obtain one from https://configure.51degrees.com?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=device-detection-src-main-java-fiftyone-devicedetection-devicedetectionpipelinebuilder.java&utm_term=usecloud + * Obtain one from https://51degrees.com/configure?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=device-detection-src-main-java-fiftyone-devicedetection-devicedetectionpipelinebuilder.java&utm_term=usecloud * @return A builder that can be used to configure and build a pipeline * that will use the cloud device detection engine. */ diff --git a/examples/device-detection/README.md b/examples/device-detection/README.md index c83d69956..5e1f575ba 100644 --- a/examples/device-detection/README.md +++ b/examples/device-detection/README.md @@ -40,11 +40,11 @@ argument to use it. You will require [resource keys](https://51degrees.com/documentation/_services__cloud__resource_keys.html?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud-resource-keys) to use the Cloud API, as described on our website. Get resource keys from -our [configurator](https://configure.51degrees.com/?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud-resource-keys), see our [documentation](https://51degrees.com/documentation/_services__configurator.html?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud-resource-keys) on +our [configuration page](https://51degrees.com/configure/?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud-resource-keys), see our [documentation](https://51degrees.com/documentation/_services__configurator.html?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud-resource-keys) on how to use this. A resource key configured with the properties needed -to run most of the examples can be obtained [here](https://configure.51degrees.com/jqz435Nc?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud-resource-keys). +to run most of the examples can be obtained [here](https://51degrees.com/configure/jqz435Nc?utm_source=github&utm_medium=readme&utm_campaign=51degrees-java&utm_content=readme.md&utm_term=cloud-resource-keys). To use the resource key in the example it can be supplied as a command line parameter, pasted into the configuration file (where there is one) or supplied as either an environment variable or a system diff --git a/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/GettingStartedCloud.java b/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/GettingStartedCloud.java index 846e1fcb4..48e1efd9c 100644 --- a/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/GettingStartedCloud.java +++ b/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/GettingStartedCloud.java @@ -47,7 +47,7 @@ *

* In order to use the cloud service you will need to obtain a "Resource Key". A free resource key * configured with the properties required by this example may be obtained from - * https://configure.51degrees.com/jqz435Nc?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-gettingstartedcloud.java&utm_term=gettingstartedcloud-2 + * https://51degrees.com/configure/jqz435Nc?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-gettingstartedcloud.java&utm_term=gettingstartedcloud-2 *

* The concepts of "pipeline", "flow data", "evidence" and "results" are illustrated. */ diff --git a/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/NativeModelCloud.java b/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/NativeModelCloud.java index 3c6c724ac..2916f169b 100644 --- a/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/NativeModelCloud.java +++ b/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/NativeModelCloud.java @@ -131,7 +131,7 @@ static void analyseNativeModel(String nativemodel, Pipeline pipeline, PrintWrite * * Unlike other examples, use of this example requires a license key which can be purchased from [our * pricing page](https://51degrees.com/pricing?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-nativemodelcloud.java&utm_term=top). Once this is done, a resource key with the - * properties required by this example can be created at [here](https://configure.51degrees.com/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-nativemodelcloud.java&utm_term=top). + * properties required by this example can be created at [here](https://51degrees.com/configure/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-nativemodelcloud.java&utm_term=top). * * This example is available in full on [GitHub](https://github.com/51Degrees/51degrees-java/blob/main/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/NativeModelCloud.java). */ \ No newline at end of file diff --git a/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/TacCloud.java b/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/TacCloud.java index ee5ee1e0b..1896616b9 100644 --- a/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/TacCloud.java +++ b/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/TacCloud.java @@ -49,7 +49,7 @@ * Unlike other examples, use of this example requires a license key which can be purchased from our * pricing page. Once this is done, a resource key with the * properties required by this example can be created - * here. + * here. *

* This resource key can be supplied as a command line argument to this program, as an environment * variable "SuperResourceKey", as a System Property "SuperResourceKey" or by editing the config @@ -136,7 +136,7 @@ static void analyseTac(String tac, Pipeline pipeline, PrintWriter output) throws * * Unlike other examples, use of this example requires a license key which can be purchased from our * [pricing page](https://51degrees.com/pricing?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-taccloud.java&utm_term=top). Once this is done, a resource key with the - * properties required by this example can be created [here](https://configure.51degrees.com/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-taccloud.java&utm_term=top). + * properties required by this example can be created [here](https://51degrees.com/configure/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-java-fiftyone-devicedetection-examples-console-taccloud.java&utm_term=top). * * This example is available in full on [GitHub](https://github.com/51Degrees/51degrees-java/blob/main/examples/device-detection/console/src/main/java/fiftyone/devicedetection/examples/console/TacCloud.java). * diff --git a/examples/device-detection/console/src/main/resources/tacCloud.xml b/examples/device-detection/console/src/main/resources/tacCloud.xml index e94963325..aed9c9717 100644 --- a/examples/device-detection/console/src/main/resources/tacCloud.xml +++ b/examples/device-detection/console/src/main/resources/tacCloud.xml @@ -30,7 +30,7 @@ from our pricing page: https://51degrees.com/pricing?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-resources-taccloud.xml&utm_term=buildparameters. Once this is done, a resource key with the properties required by this example - can be created at https://configure.51degrees.com/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-resources-taccloud.xml&utm_term=buildparameters. + can be created at https://51degrees.com/configure/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=console-src-main-resources-taccloud.xml&utm_term=buildparameters. You can paste the resource key here, or set an environment variable or System property called "SuperResourceKey" diff --git a/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/KeyHelper.java b/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/KeyHelper.java index 467a443be..06ae82900 100644 --- a/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/KeyHelper.java +++ b/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/KeyHelper.java @@ -43,7 +43,7 @@ public class KeyHelper { "_51DEGREES_RESOURCE_KEY_BESPOKE")); static final String CREATE_KEY_URL = - "https://configure.51degrees.com/?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-keyhelper.java&utm_term=no-resource-key"; + "https://51degrees.com/configure/?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-keyhelper.java&utm_term=no-resource-key"; /** * The resource key for a test that calls the live cloud service, from @@ -163,7 +163,7 @@ public static String getOrSetTestResourceKey(String value, boolean shouldThrow) return getOrSetResourceKey(value, TEST_RESOURCE_KEY, "A free resource key configured with the " + "properties required by this example may be obtained from " + - "https://configure.51degrees.com/jqz435Nc?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-keyhelper.java&utm_term=resource-key-required ", + "https://51degrees.com/configure/jqz435Nc?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-keyhelper.java&utm_term=resource-key-required ", shouldThrow); } public static String getOrSetTestResourceKey(String value) { @@ -210,7 +210,7 @@ public static String getOrSetSuperResourceKey(String value, String variablename, "that you will first need a license key, which can be purchased " + "from our pricing page: https://51degrees.com/pricing?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-keyhelper.java&utm_term=license-key-required. \nOnce this is " + "done, a resource key with the properties required by this example " + - "can be created at https://configure.51degrees.com/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-keyhelper.java&utm_term=license-key-required. ", + "can be created at https://51degrees.com/configure/QKyYH5XT?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-keyhelper.java&utm_term=license-key-required. ", shouldThrow); } } diff --git a/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/settings.xml b/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/settings.xml index cbbbbc9af..96c2db41c 100644 --- a/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/settings.xml +++ b/examples/device-detection/shared/src/main/java/fiftyone/devicedetection/examples/shared/settings.xml @@ -45,7 +45,7 @@ your IDE launch configuration or your operating system shell. + https://51degrees.com/configure/jqz435Nc?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-devicedetection-examples-shared-settings.xml&utm_term=properties --> diff --git a/examples/device-detection/shared/src/test/resources/51Degrees-Cloud-Test.xml b/examples/device-detection/shared/src/test/resources/51Degrees-Cloud-Test.xml index 335efff11..d02f4f902 100644 --- a/examples/device-detection/shared/src/test/resources/51Degrees-Cloud-Test.xml +++ b/examples/device-detection/shared/src/test/resources/51Degrees-Cloud-Test.xml @@ -27,7 +27,7 @@ http://cloud.51degrees.com/api/v4 + created at https://51degrees.com/configure/hYzn3TV3?utm_source=code&utm_medium=example&utm_campaign=51degrees-java&utm_content=shared-src-main-java-fiftyone-ipintelligence-examples-shared-settings.xml&utm_term=properties. --> diff --git a/examples/ip-intelligence/shared/src/test/resources/51Degrees-Cloud-Test.xml b/examples/ip-intelligence/shared/src/test/resources/51Degrees-Cloud-Test.xml index 3af0fba3c..4e16e3e9e 100644 --- a/examples/ip-intelligence/shared/src/test/resources/51Degrees-Cloud-Test.xml +++ b/examples/ip-intelligence/shared/src/test/resources/51Degrees-Cloud-Test.xml @@ -27,7 +27,7 @@ http://cloud.51degrees.com/api/v4 diff --git a/location/geo-location.web.examples/geo-location.web.examples.servlet/src/main/webapp/WEB-INF/51Degrees-Cloud.xml b/location/geo-location.web.examples/geo-location.web.examples.servlet/src/main/webapp/WEB-INF/51Degrees-Cloud.xml index 23e052eee..5a3b9582f 100644 --- a/location/geo-location.web.examples/geo-location.web.examples.servlet/src/main/webapp/WEB-INF/51Degrees-Cloud.xml +++ b/location/geo-location.web.examples/geo-location.web.examples.servlet/src/main/webapp/WEB-INF/51Degrees-Cloud.xml @@ -27,7 +27,7 @@ https://cloud.51degrees.com/api/v4 diff --git a/location/geo-location/src/main/java/fiftyone/geolocation/GeoLocationPipelineBuilder.java b/location/geo-location/src/main/java/fiftyone/geolocation/GeoLocationPipelineBuilder.java index 464d12a4d..ecb3d61a2 100644 --- a/location/geo-location/src/main/java/fiftyone/geolocation/GeoLocationPipelineBuilder.java +++ b/location/geo-location/src/main/java/fiftyone/geolocation/GeoLocationPipelineBuilder.java @@ -63,7 +63,7 @@ public GeoLocationPipelineBuilder( * Use the 51Degrees cloud service to perform Geo Location. * @param resourceKey the resource key to use when querying the * service. - * Obtain one from https://configure.51degrees.com?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=geo-location-src-main-java-fiftyone-geolocation-geolocationpipelinebuilder.java&utm_term=usecloud + * Obtain one from https://51degrees.com/configure?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=geo-location-src-main-java-fiftyone-geolocation-geolocationpipelinebuilder.java&utm_term=usecloud * @param provider the Geo Location provider to use * @return builder that can be used to configure and build a pipeline * that will use the cloud Geo Location engine @@ -79,7 +79,7 @@ public GeoLocationCloudPipelineBuilder useCloud( /** * Use the 51Degrees cloud service to perform Geo Location * @param resourceKey the resource to use when querying the cloud service. - * Obtain one from https://configure.51degrees.com?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=geo-location-src-main-java-fiftyone-geolocation-geolocationpipelinebuilder.java&utm_term=usecloud-2 + * Obtain one from https://51degrees.com/configure?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=geo-location-src-main-java-fiftyone-geolocation-geolocationpipelinebuilder.java&utm_term=usecloud-2 * @param endpoint the 51Degrees cloud URL * @param provider the Geo Location provider to use * @return a builder that can be used to configure and build a pipeline that diff --git a/pipeline/pipeline.cloudrequestengine/src/main/java/fiftyone/pipeline/cloudrequestengine/Constants.java b/pipeline/pipeline.cloudrequestengine/src/main/java/fiftyone/pipeline/cloudrequestengine/Constants.java index eebb82eb4..2c72e203d 100644 --- a/pipeline/pipeline.cloudrequestengine/src/main/java/fiftyone/pipeline/cloudrequestengine/Constants.java +++ b/pipeline/pipeline.cloudrequestengine/src/main/java/fiftyone/pipeline/cloudrequestengine/Constants.java @@ -32,7 +32,7 @@ public class Messages { + "to authenticate with, as the cloud service answers 401 to a " + "request that carries neither. Use setResourceKey(String) with " + "a resource key created for free at " - + "https://configure.51degrees.com?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=pipeline.cloudrequestengine-src-main-java-fiftyone-pipeline-cloudrequestengine-constants.java&utm_term=no-credential"; + + "https://51degrees.com/configure?utm_source=code&utm_medium=comment&utm_campaign=51degrees-java&utm_content=pipeline.cloudrequestengine-src-main-java-fiftyone-pipeline-cloudrequestengine-constants.java&utm_term=no-credential"; public static final String LicenseKeyNeedsProperties = "The Cloud Request Engine has a license key and no requested " diff --git a/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/CloudRequestEngineLiveTests.java b/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/CloudRequestEngineLiveTests.java index 8f8487633..20b2e4d87 100644 --- a/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/CloudRequestEngineLiveTests.java +++ b/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/CloudRequestEngineLiveTests.java @@ -98,7 +98,7 @@ public void build_Process_ReadsDeviceDataFromTheLiveService() "The live cloud service listed no products for this resource " + "key. A key carries the products its account holds, so this " + "is an entitlement problem and not a fault in the service. " - + "Create a key at https://configure.51degrees.com."); + + "Create a key at https://51degrees.com/configure."); assertTrue(products.containsKey("device"), "The live cloud service listed the products " + String.join(", ", products.keySet()) + " for this resource " diff --git a/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/LiveCloudKeys.java b/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/LiveCloudKeys.java index 6bb87c5fe..20e39841b 100644 --- a/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/LiveCloudKeys.java +++ b/pipeline/pipeline.cloudrequestengine/src/test/java/fiftyone/pipeline/cloudrequestengine/flowelements/LiveCloudKeys.java @@ -88,6 +88,6 @@ static String noResourceKey() { + "as an environment variable or as a system property, tried in " + "that order. The key has to carry the device product, because " + "the test asks the service for device detection properties. " - + "Create a key at https://configure.51degrees.com."; + + "Create a key at https://51degrees.com/configure."; } } diff --git a/pipeline/pipeline.core/src/test/resources/options-test.xml b/pipeline/pipeline.core/src/test/resources/options-test.xml index 335efff11..d02f4f902 100644 --- a/pipeline/pipeline.core/src/test/resources/options-test.xml +++ b/pipeline/pipeline.core/src/test/resources/options-test.xml @@ -27,7 +27,7 @@ http://cloud.51degrees.com/api/v4