From 492cfd580ee9357eb048dfab087bb48f88aa3c87 Mon Sep 17 00:00:00 2001 From: pengzhile Date: Thu, 10 Oct 2019 12:12:47 +0800 Subject: [PATCH] plugin add datacenter property Signed-off-by: pengzhile --- src/main/java/io/zhile/crack/atlassian/Usage.java | 15 ++++++++------- .../crack/atlassian/license/LicenseProperty.java | 4 ---- .../crack/atlassian/license/products/Bamboo.java | 6 +++--- .../atlassian/license/products/Bitbucket.java | 4 ---- .../crack/atlassian/license/products/Capture.java | 4 ++-- .../atlassian/license/products/Confluence.java | 4 ---- .../crack/atlassian/license/products/Crowd.java | 4 ---- .../atlassian/license/products/Crucible.java | 4 ++-- .../crack/atlassian/license/products/FishEye.java | 4 ++-- .../atlassian/license/products/JIRACore.java | 4 ++-- .../license/products/JIRAServiceDesk.java | 4 ---- .../atlassian/license/products/JIRASoftware.java | 4 ---- .../crack/atlassian/license/products/Plugin.java | 4 ---- .../atlassian/license/products/Portfolio.java | 4 ---- .../atlassian/license/products/Questions.java | 4 ---- .../atlassian/license/products/TeamCalendars.java | 4 ---- .../atlassian/license/products/ThirdPlugin.java | 4 ++-- .../atlassian/license/products/Training.java | 4 ++-- 18 files changed, 23 insertions(+), 62 deletions(-) diff --git a/src/main/java/io/zhile/crack/atlassian/Usage.java b/src/main/java/io/zhile/crack/atlassian/Usage.java index f8fd88f..22a8bdf 100644 --- a/src/main/java/io/zhile/crack/atlassian/Usage.java +++ b/src/main/java/io/zhile/crack/atlassian/Usage.java @@ -5,6 +5,7 @@ import io.zhile.crack.atlassian.license.LicenseProperty; import io.zhile.crack.atlassian.license.products.*; import org.apache.commons.cli.*; +import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -120,22 +121,22 @@ public class Usage { property = new TeamCalendars(contactName, contactEMail, serverID, organisation, dataCenter); break; case "bamboo": - property = new Bamboo(contactName, contactEMail, serverID, organisation); + property = new Bamboo(contactName, contactEMail, serverID, organisation, dataCenter); break; case "bitbucket": property = new Bitbucket(contactName, contactEMail, serverID, organisation, dataCenter); break; case "fisheye": - property = new FishEye(contactName, contactEMail, serverID, organisation); + property = new FishEye(contactName, contactEMail, serverID, organisation, dataCenter); break; case "crucible": - property = new Crucible(contactName, contactEMail, serverID, organisation); + property = new Crucible(contactName, contactEMail, serverID, organisation, dataCenter); break; case "crowd": property = new Crowd(contactName, contactEMail, serverID, organisation, dataCenter); break; case "jc": - property = new JIRACore(contactName, contactEMail, serverID, organisation); + property = new JIRACore(contactName, contactEMail, serverID, organisation, dataCenter); break; case "portfolio": property = new Portfolio(contactName, contactEMail, serverID, organisation, dataCenter); @@ -144,13 +145,13 @@ public class Usage { property = new JIRAServiceDesk(contactName, contactEMail, serverID, organisation, dataCenter); break; case "training": - property = new Training(contactName, contactEMail, serverID, organisation); + property = new Training(contactName, contactEMail, serverID, organisation, dataCenter); break; case "capture": - property = new Capture(contactName, contactEMail, serverID, organisation); + property = new Capture(contactName, contactEMail, serverID, organisation, dataCenter); break; default: - property = new ThirdPlugin(contactName, contactEMail, serverID, organisation); + property = new ThirdPlugin(contactName, contactEMail, serverID, organisation, dataCenter); ((ThirdPlugin) property).setProductName(product); break; } diff --git a/src/main/java/io/zhile/crack/atlassian/license/LicenseProperty.java b/src/main/java/io/zhile/crack/atlassian/license/LicenseProperty.java index c1d3459..f20dad7 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/LicenseProperty.java +++ b/src/main/java/io/zhile/crack/atlassian/license/LicenseProperty.java @@ -30,10 +30,6 @@ abstract public class LicenseProperty { this.dataCenter = dataCenter; } - public LicenseProperty(String contactName, String contactEMail, String serverID, String organisation) { - this(contactName, contactEMail, serverID, organisation, false); - } - public void init() { Date expiryDate = new Date(3771590399000L); String licenseId = "L" + System.currentTimeMillis(); diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Bamboo.java b/src/main/java/io/zhile/crack/atlassian/license/products/Bamboo.java index f86c53b..eae5aea 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Bamboo.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Bamboo.java @@ -9,8 +9,8 @@ import io.zhile.crack.atlassian.license.LicenseProperty; * @link https://zhile.io */ public class Bamboo extends LicenseProperty { - public Bamboo(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); + public Bamboo(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) { + super(contactName, contactEMail, serverID, organisation, dataCenter); } @Override @@ -30,7 +30,7 @@ public class Bamboo extends LicenseProperty { @Override public void setNumberOfUsers(int numberOfUsers) { - // + // disabled } public void setLicenseEdition(LicenseEdition licenseEdition) { diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Bitbucket.java b/src/main/java/io/zhile/crack/atlassian/license/products/Bitbucket.java index e15fd71..f415214 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Bitbucket.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Bitbucket.java @@ -12,10 +12,6 @@ public class Bitbucket extends LicenseProperty { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public Bitbucket(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public String getProductName() { return "stash"; diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Capture.java b/src/main/java/io/zhile/crack/atlassian/license/products/Capture.java index f0f9669..2515c7b 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Capture.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Capture.java @@ -6,8 +6,8 @@ package io.zhile.crack.atlassian.license.products; * @link https://zhile.io */ public class Capture extends ThirdPlugin { - public Capture(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); + public Capture(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) { + super(contactName, contactEMail, serverID, organisation, dataCenter); setProductName("bonfire"); } diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Confluence.java b/src/main/java/io/zhile/crack/atlassian/license/products/Confluence.java index 9e06714..e2ed7c6 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Confluence.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Confluence.java @@ -12,10 +12,6 @@ public class Confluence extends LicenseProperty { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public Confluence(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public String getProductName() { return "conf"; diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Crowd.java b/src/main/java/io/zhile/crack/atlassian/license/products/Crowd.java index b9067bd..52784de 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Crowd.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Crowd.java @@ -12,10 +12,6 @@ public class Crowd extends LicenseProperty { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public Crowd(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public String getProductName() { return "crowd"; diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Crucible.java b/src/main/java/io/zhile/crack/atlassian/license/products/Crucible.java index d5f3bfb..97f5939 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Crucible.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Crucible.java @@ -8,8 +8,8 @@ import io.zhile.crack.atlassian.license.LicenseProperty; * @link https://zhile.io */ public class Crucible extends LicenseProperty { - public Crucible(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); + public Crucible(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) { + super(contactName, contactEMail, serverID, organisation, dataCenter); } @Override diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/FishEye.java b/src/main/java/io/zhile/crack/atlassian/license/products/FishEye.java index 4ca3b23..7559d4c 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/FishEye.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/FishEye.java @@ -8,8 +8,8 @@ import io.zhile.crack.atlassian.license.LicenseProperty; * @link https://zhile.io */ public class FishEye extends LicenseProperty { - public FishEye(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); + public FishEye(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) { + super(contactName, contactEMail, serverID, organisation, dataCenter); } @Override diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/JIRACore.java b/src/main/java/io/zhile/crack/atlassian/license/products/JIRACore.java index b88d771..94c7aa2 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/JIRACore.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/JIRACore.java @@ -10,8 +10,8 @@ import io.zhile.crack.atlassian.license.LicenseType; * @link https://zhile.io */ public class JIRACore extends LicenseProperty { - public JIRACore(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); + public JIRACore(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) { + super(contactName, contactEMail, serverID, organisation, dataCenter); } @Override diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/JIRAServiceDesk.java b/src/main/java/io/zhile/crack/atlassian/license/products/JIRAServiceDesk.java index c2114d6..5b17c45 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/JIRAServiceDesk.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/JIRAServiceDesk.java @@ -13,10 +13,6 @@ public class JIRAServiceDesk extends LicenseProperty { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public JIRAServiceDesk(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public void init() { super.init(); diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/JIRASoftware.java b/src/main/java/io/zhile/crack/atlassian/license/products/JIRASoftware.java index 7968d47..f66831a 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/JIRASoftware.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/JIRASoftware.java @@ -14,10 +14,6 @@ public class JIRASoftware extends LicenseProperty { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public JIRASoftware(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public void init() { super.init(); diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Plugin.java b/src/main/java/io/zhile/crack/atlassian/license/products/Plugin.java index c1015e8..cfaed6d 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Plugin.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Plugin.java @@ -12,10 +12,6 @@ abstract public class Plugin extends LicenseProperty { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public Plugin(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public void init() { super.init(); diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Portfolio.java b/src/main/java/io/zhile/crack/atlassian/license/products/Portfolio.java index f3175e3..35340ce 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Portfolio.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Portfolio.java @@ -10,10 +10,6 @@ public class Portfolio extends Plugin { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public Portfolio(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public String getProductName() { return "com.radiantminds.roadmaps-jira"; diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Questions.java b/src/main/java/io/zhile/crack/atlassian/license/products/Questions.java index e9ea963..4a02c08 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Questions.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Questions.java @@ -10,10 +10,6 @@ public class Questions extends Plugin { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public Questions(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public String getProductName() { return "com.atlassian.confluence.plugins.confluence-questions"; diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/TeamCalendars.java b/src/main/java/io/zhile/crack/atlassian/license/products/TeamCalendars.java index 350c76d..c621da0 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/TeamCalendars.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/TeamCalendars.java @@ -10,10 +10,6 @@ public class TeamCalendars extends Plugin { super(contactName, contactEMail, serverID, organisation, dataCenter); } - public TeamCalendars(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); - } - @Override public String getProductName() { return "team_calendars"; diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/ThirdPlugin.java b/src/main/java/io/zhile/crack/atlassian/license/products/ThirdPlugin.java index d9124e1..4911e1e 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/ThirdPlugin.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/ThirdPlugin.java @@ -10,8 +10,8 @@ import io.zhile.crack.atlassian.license.LicenseType; public class ThirdPlugin extends Plugin { protected String productName; - public ThirdPlugin(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); + public ThirdPlugin(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) { + super(contactName, contactEMail, serverID, organisation, dataCenter); } @Override diff --git a/src/main/java/io/zhile/crack/atlassian/license/products/Training.java b/src/main/java/io/zhile/crack/atlassian/license/products/Training.java index 8041c5a..18a2659 100644 --- a/src/main/java/io/zhile/crack/atlassian/license/products/Training.java +++ b/src/main/java/io/zhile/crack/atlassian/license/products/Training.java @@ -6,8 +6,8 @@ package io.zhile.crack.atlassian.license.products; * @link https://zhile.io */ public class Training extends Plugin { - public Training(String contactName, String contactEMail, String serverID, String organisation) { - super(contactName, contactEMail, serverID, organisation); + public Training(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) { + super(contactName, contactEMail, serverID, organisation, dataCenter); } @Override