Skip to content

Commit e02e77d

Browse files
committed
Added lombok to remove getters and setters and stuff
1 parent e45af57 commit e02e77d

File tree

15 files changed

+50
-671
lines changed

15 files changed

+50
-671
lines changed

Main Plugin/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,11 @@
105105
<version>4.12</version>
106106
<scope>test</scope>
107107
</dependency>
108+
<dependency>
109+
<groupId>org.projectlombok</groupId>
110+
<artifactId>lombok</artifactId>
111+
<version>1.16.16</version>
112+
<scope>provided</scope>
113+
</dependency>
108114
</dependencies>
109115
</project>

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void execute(String sectionName, SectionProps sectionProps, ServerSection
9292
if (sectionProps.getProvider() == null) {
9393
ServerSection current = section.getParent();
9494
if (current != null) {
95-
while (current.getExplicitProvider() == null) {
95+
while (current.getProps().getProvider() == null) {
9696
current = current.getParent();
9797
}
9898

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/ServerSection.java

Lines changed: 2 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
import com.jaimemartz.playerbalancer.connection.provider.AbstractProvider;
55
import com.jaimemartz.playerbalancer.settings.props.shared.SectionProps;
66
import com.jaimemartz.playerbalancer.utils.AlphanumComparator;
7+
import lombok.Data;
78
import net.md_5.bungee.api.config.ServerInfo;
89

910
import java.util.Collections;
1011
import java.util.Set;
1112
import java.util.TreeSet;
1213

14+
@Data
1315
public class ServerSection {
1416
private final String name;
1517
private final SectionProps props;
@@ -34,104 +36,11 @@ public ServerSection(String name, SectionProps props) {
3436
));
3537
}
3638

37-
public String getName() {
38-
return name;
39-
}
40-
41-
public int getPosition() {
42-
return position;
43-
}
44-
45-
public void setPosition(int position) {
46-
this.position = position;
47-
}
48-
49-
public SectionProps getProps() {
50-
return props;
51-
}
52-
53-
public boolean isInherited() {
54-
return inherited;
55-
}
56-
57-
public void setInherited(boolean inherited) {
58-
this.inherited = inherited;
59-
}
60-
61-
public ServerSection getParent() {
62-
return parent;
63-
}
64-
65-
public void setParent(ServerSection parent) {
66-
this.parent = parent;
67-
}
68-
6939
public ProviderType getImplicitProvider() {
7040
if (inherited) {
7141
return parent.getImplicitProvider();
7242
} else {
7343
return props.getProvider();
7444
}
75-
76-
}
77-
78-
public ProviderType getExplicitProvider() {
79-
return props.getProvider();
80-
}
81-
82-
public void setExplicitProvider(ProviderType provider) {
83-
props.setProvider(provider);
84-
inherited = false;
85-
}
86-
87-
public void setExternalProvider(AbstractProvider externalProvider) {
88-
this.externalProvider = externalProvider;
89-
}
90-
91-
public AbstractProvider getExternalProvider() {
92-
return externalProvider;
93-
}
94-
95-
public ServerInfo getServer() {
96-
return server;
97-
}
98-
99-
public void setServer(ServerInfo server) {
100-
this.server = server;
101-
}
102-
103-
public SectionCommand getCommand() {
104-
return command;
105-
}
106-
107-
public void setCommand(SectionCommand command) {
108-
this.command = command;
109-
}
110-
111-
public Set<ServerInfo> getServers() {
112-
return servers;
113-
}
114-
115-
public boolean isValid() {
116-
return valid;
117-
}
118-
119-
public void setValid(boolean valid) {
120-
this.valid = valid;
121-
}
122-
123-
@Override
124-
public String toString() {
125-
return "ServerSection{" +
126-
"name='" + name + '\'' +
127-
", props=" + props +
128-
", inherited=" + inherited +
129-
", parent=" + parent +
130-
", position=" + position +
131-
", server=" + server +
132-
", command=" + command +
133-
", servers=" + servers +
134-
", valid=" + valid +
135-
'}';
13645
}
13746
}
Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.jaimemartz.playerbalancer.settings.props;
22

33
import com.jaimemartz.playerbalancer.settings.props.features.*;
4+
import lombok.Data;
45
import ninja.leaping.configurate.objectmapping.Setting;
56
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
67

78
@ConfigSerializable
9+
@Data
810
public class FeaturesProps {
911
@Setting(value = "balancer")
1012
private BalancerProps balancerProps;
@@ -20,55 +22,4 @@ public class FeaturesProps {
2022

2123
@Setting(value = "server-refresh")
2224
private ServerRefreshProps serverRefreshProps;
23-
24-
public BalancerProps getBalancerProps() {
25-
return balancerProps;
26-
}
27-
28-
public void setBalancerProps(BalancerProps balancerProps) {
29-
this.balancerProps = balancerProps;
30-
}
31-
32-
public FallbackCommandProps getFallbackCommandProps() {
33-
return fallbackCommandProps;
34-
}
35-
36-
public void setFallbackCommandProps(FallbackCommandProps fallbackCommandProps) {
37-
this.fallbackCommandProps = fallbackCommandProps;
38-
}
39-
40-
public ServerCheckerProps getServerCheckerProps() {
41-
return serverCheckerProps;
42-
}
43-
44-
public void setServerCheckerProps(ServerCheckerProps serverCheckerProps) {
45-
this.serverCheckerProps = serverCheckerProps;
46-
}
47-
48-
public KickHandlerProps getKickHandlerProps() {
49-
return kickHandlerProps;
50-
}
51-
52-
public void setKickHandlerProps(KickHandlerProps kickHandlerProps) {
53-
this.kickHandlerProps = kickHandlerProps;
54-
}
55-
56-
public ServerRefreshProps getServerRefreshProps() {
57-
return serverRefreshProps;
58-
}
59-
60-
public void setServerRefreshProps(ServerRefreshProps serverRefreshProps) {
61-
this.serverRefreshProps = serverRefreshProps;
62-
}
63-
64-
@Override
65-
public String toString() {
66-
return "FeaturesProps{" +
67-
"balancerProps=" + balancerProps +
68-
", fallbackCommandProps=" + fallbackCommandProps +
69-
", serverCheckerProps=" + serverCheckerProps +
70-
", kickHandlerProps=" + kickHandlerProps +
71-
", serverRefreshProps=" + serverRefreshProps +
72-
'}';
73-
}
7425
}
Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.jaimemartz.playerbalancer.settings.props;
22

3+
import lombok.Data;
34
import ninja.leaping.configurate.objectmapping.Setting;
45
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
56

67
@ConfigSerializable
8+
@Data
79
public class GeneralProps {
810
@Setting
911
private boolean enabled;
@@ -22,64 +24,4 @@ public class GeneralProps {
2224

2325
@Setting
2426
private String version;
25-
26-
public boolean isEnabled() {
27-
return enabled;
28-
}
29-
30-
public void setEnabled(boolean enabled) {
31-
this.enabled = enabled;
32-
}
33-
34-
public boolean isSilent() {
35-
return silent;
36-
}
37-
38-
public void setSilent(boolean silent) {
39-
this.silent = silent;
40-
}
41-
42-
public boolean isAutoReload() {
43-
return autoReload;
44-
}
45-
46-
public void setAutoReload(boolean autoReload) {
47-
this.autoReload = autoReload;
48-
}
49-
50-
public boolean isRedisBungee() {
51-
return redisBungee;
52-
}
53-
54-
public void setRedisBungee(boolean redisBungee) {
55-
this.redisBungee = redisBungee;
56-
}
57-
58-
public boolean isPluginMessaging() {
59-
return pluginMessaging;
60-
}
61-
62-
public void setPluginMessaging(boolean pluginMessaging) {
63-
this.pluginMessaging = pluginMessaging;
64-
}
65-
66-
public String getVersion() {
67-
return version;
68-
}
69-
70-
public void setVersion(String version) {
71-
this.version = version;
72-
}
73-
74-
@Override
75-
public String toString() {
76-
return "GeneralProps{" +
77-
"enabled=" + enabled +
78-
", silent=" + silent +
79-
", autoReload=" + autoReload +
80-
", redisBungee=" + redisBungee +
81-
", pluginMessaging=" + pluginMessaging +
82-
", version='" + version + '\'' +
83-
'}';
84-
}
8527
}
Lines changed: 2 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package com.jaimemartz.playerbalancer.settings.props;
22

3+
import lombok.Data;
34
import ninja.leaping.configurate.objectmapping.Setting;
45
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
56

67
@ConfigSerializable
8+
@Data
79
public class MessagesProps {
810
@Setting(value = "connecting-server")
911
private String connectingMessage;
@@ -31,91 +33,4 @@ public class MessagesProps {
3133

3234
@Setting(value = "same-section")
3335
private String sameSectionMessage;
34-
35-
public String getConnectingMessage() {
36-
return connectingMessage;
37-
}
38-
39-
public void setConnectingMessage(String connectingMessage) {
40-
this.connectingMessage = connectingMessage;
41-
}
42-
43-
public String getConnectedMessage() {
44-
return connectedMessage;
45-
}
46-
47-
public void setConnectedMessage(String connectedMessage) {
48-
this.connectedMessage = connectedMessage;
49-
}
50-
51-
public String getFailureMessage() {
52-
return failureMessage;
53-
}
54-
55-
public void setFailureMessage(String failureMessage) {
56-
this.failureMessage = failureMessage;
57-
}
58-
59-
public String getUnknownSectionMessage() {
60-
return unknownSectionMessage;
61-
}
62-
63-
public void setUnknownSectionMessage(String unknownSectionMessage) {
64-
this.unknownSectionMessage = unknownSectionMessage;
65-
}
66-
67-
public String getInvalidInputMessage() {
68-
return invalidInputMessage;
69-
}
70-
71-
public void setInvalidInputMessage(String invalidInputMessage) {
72-
this.invalidInputMessage = invalidInputMessage;
73-
}
74-
75-
public String getUnavailableServerMessage() {
76-
return unavailableServerMessage;
77-
}
78-
79-
public void setUnavailableServerMessage(String unavailableServerMessage) {
80-
this.unavailableServerMessage = unavailableServerMessage;
81-
}
82-
83-
public String getKickMessage() {
84-
return kickMessage;
85-
}
86-
87-
public void setKickMessage(String kickMessage) {
88-
this.kickMessage = kickMessage;
89-
}
90-
91-
public String getBypassMessage() {
92-
return bypassMessage;
93-
}
94-
95-
public void setBypassMessage(String bypassMessage) {
96-
this.bypassMessage = bypassMessage;
97-
}
98-
99-
public String getSameSectionMessage() {
100-
return sameSectionMessage;
101-
}
102-
103-
public void setSameSectionMessage(String sameSectionMessage) {
104-
this.sameSectionMessage = sameSectionMessage;
105-
}
106-
107-
@Override
108-
public String toString() {
109-
return "MessagesProps{" +
110-
"connectingMessage=" + connectingMessage +
111-
", connectedMessage=" + connectedMessage +
112-
", failureMessage=" + failureMessage +
113-
", unknownSectionMessage=" + unknownSectionMessage +
114-
", invalidInputMessage=" + invalidInputMessage +
115-
", unavailableServerMessage=" + unavailableServerMessage +
116-
", kickMessage=" + kickMessage +
117-
", bypassMessage=" + bypassMessage +
118-
", sameSectionMessage=" + sameSectionMessage +
119-
'}';
120-
}
12136
}

0 commit comments

Comments
 (0)