Skip to content

Commit 4883880

Browse files
tlkcmaglie
tlk
authored and
cmaglie
committed
Remove "MrBean" dependency
Sacrifice abstract classes and interfaces to reduce the amount of magic performed by MrBean. Refs HuayraLinux/pkg-arduino#4
1 parent 15133a0 commit 4883880

24 files changed

+143
-153
lines changed

‎.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-152.jar"/>
2424
<classpathentry kind="lib" path="app/lib/jackson-core-2.9.5.jar"/>
2525
<classpathentry kind="lib" path="app/lib/jackson-databind-2.9.5.jar"/>
26-
<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.9.5.jar"/>
2726
<classpathentry kind="lib" path="app/lib/jackson-annotations-2.9.5.jar"/>
2827
<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
2928
<classpathentry kind="lib" path="app/lib/commons-lang3-3.8.1.jar"/>

‎app/.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<classpathentry kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
3535
<classpathentry kind="lib" path="lib/jackson-core-2.9.5.jar"/>
3636
<classpathentry kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
37-
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.9.5.jar"/>
3837
<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
3938
<classpathentry kind="lib" path="lib/jmdns-3.5.3.jar"/>
4039
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>

‎app/lib/jackson-module-mrbean-2.9.5.jar

-78.8 KB
Binary file not shown.

‎app/test/cc/arduino/contributions/GzippedJsonDownloaderTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import cc.arduino.utils.MultiStepProgress;
55
import com.fasterxml.jackson.databind.DeserializationFeature;
66
import com.fasterxml.jackson.databind.ObjectMapper;
7-
import com.fasterxml.jackson.module.mrbean.MrBeanModule;
87
import org.junit.After;
98
import org.junit.Before;
109
import org.junit.Test;
@@ -47,7 +46,6 @@ public void testJsonDownload() throws Exception {
4746

4847
InputStream indexIn = new FileInputStream(tempFile);
4948
ObjectMapper mapper = new ObjectMapper();
50-
mapper.registerModule(new MrBeanModule());
5149
mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
5250
mapper.configure(DeserializationFeature.EAGER_DESERIALIZER_FETCH, true);
5351
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

‎app/test/cc/arduino/contributions/JsonDownloaderTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import cc.arduino.utils.MultiStepProgress;
55
import com.fasterxml.jackson.databind.DeserializationFeature;
66
import com.fasterxml.jackson.databind.ObjectMapper;
7-
import com.fasterxml.jackson.module.mrbean.MrBeanModule;
87
import org.junit.After;
98
import org.junit.Before;
109
import org.junit.Test;
@@ -46,7 +45,6 @@ public void testJsonDownload() throws Exception {
4645

4746
InputStream indexIn = new FileInputStream(tempFile);
4847
ObjectMapper mapper = new ObjectMapper();
49-
mapper.registerModule(new MrBeanModule());
5048
mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
5149
mapper.configure(DeserializationFeature.EAGER_DESERIALIZER_FETCH, true);
5250
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

‎arduino-core/.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<classpathentry kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
2121
<classpathentry kind="lib" path="lib/jackson-core-2.9.5.jar"/>
2222
<classpathentry kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
23-
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.9.5.jar"/>
2423
<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
2524
<classpathentry kind="lib" path="lib/jna-4.2.2.jar"/>
2625
<classpathentry kind="lib" path="lib/jna-platform-4.2.2.jar"/>

‎arduino-core/lib/jackson-module-mrbean-2.9.5.jar

-78.8 KB
Binary file not shown.

‎arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java

+45-14
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,69 @@
3535
import static processing.app.I18n.tr;
3636

3737
import java.util.Comparator;
38+
import java.util.ArrayList;
3839
import java.util.List;
3940
import java.util.Optional;
4041

4142
import cc.arduino.contributions.VersionHelper;
4243

43-
public abstract class ContributedLibrary extends DownloadableContribution {
44+
public class ContributedLibrary extends DownloadableContribution {
4445

45-
public abstract String getName();
46+
private String url;
47+
public String getUrl() { return url; }
4648

47-
public abstract String getMaintainer();
49+
private String version;
50+
public String getVersion() { return version; }
4851

49-
public abstract String getAuthor();
52+
private String checksum;
53+
public String getChecksum() { return checksum; }
5054

51-
public abstract String getWebsite();
55+
private long size;
56+
public long getSize() { return size; }
5257

53-
public abstract String getCategory();
58+
private String archiveFileName;
59+
public String getArchiveFileName() { return archiveFileName; }
5460

55-
public abstract void setCategory(String category);
5661

57-
public abstract String getLicense();
5862

59-
public abstract String getParagraph();
63+
private String name;
64+
public String getName() { return name; }
6065

61-
public abstract String getSentence();
66+
private String maintainer;
67+
public String getMaintainer() { return maintainer; }
6268

63-
public abstract List<String> getArchitectures();
69+
private String author;
70+
public String getAuthor() { return author; }
6471

65-
public abstract List<String> getTypes();
72+
private String website;
73+
public String getWebsite() { return website; }
74+
75+
private String category;
76+
public String getCategory() { return category; }
77+
public void setCategory(String category) { this.category = category; }
78+
79+
private String licence;
80+
public String getLicense() { return licence; }
81+
82+
private String paragraph;
83+
public String getParagraph() { return paragraph; }
84+
85+
private String sentence;
86+
public String getSentence() { return sentence; }
87+
88+
private ArrayList<String> architectures;
89+
public List<String> getArchitectures() { return architectures; }
90+
91+
private ArrayList<String> types;
92+
public List<String> getTypes() { return types; }
93+
94+
private ArrayList<ContributedLibraryDependency> dependencies;
95+
public List<ContributedLibraryDependency> getDependencies() { return dependencies; }
96+
97+
private ArrayList<String> providesIncludes;
98+
public List<String> getProvidesIncludes() { return providesIncludes; }
6699

67-
public abstract List<ContributedLibraryDependency> getDependencies();
68100

69-
public abstract List<String> getProvidesIncludes();
70101

71102
public static final Comparator<ContributedLibrary> CASE_INSENSITIVE_ORDER = (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName());
72103

‎arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@
2929

3030
package cc.arduino.contributions.libraries;
3131

32-
public abstract class ContributedLibraryDependency {
32+
public class ContributedLibraryDependency {
3333

34-
public abstract String getName();
34+
private String name;
35+
public String getName() { return name; }
3536

36-
public abstract String getVersion();
37+
private String version;
38+
public String getVersion() { return version; }
3739

3840
@Override
3941
public String toString() {

‎arduino-core/src/cc/arduino/contributions/libraries/EmptyLibrariesIndex.java

-44
This file was deleted.

‎arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,13 @@
4040

4141
import cc.arduino.contributions.VersionComparator;
4242

43-
public abstract class LibrariesIndex {
43+
public class LibrariesIndex {
4444

45-
public abstract List<ContributedLibrary> getLibraries();
45+
private ArrayList<ContributedLibrary> list = new ArrayList<>();
46+
47+
public List<ContributedLibrary> getLibraries() {
48+
return list;
49+
}
4650

4751
public List<ContributedLibrary> find(final String name) {
4852
return getLibraries().stream() //

‎arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import com.fasterxml.jackson.databind.DeserializationFeature;
3737
import com.fasterxml.jackson.databind.JsonMappingException;
3838
import com.fasterxml.jackson.databind.ObjectMapper;
39-
import com.fasterxml.jackson.module.mrbean.MrBeanModule;
4039
import org.apache.commons.compress.utils.IOUtils;
4140
import processing.app.BaseNoGui;
4241
import processing.app.I18n;
@@ -76,7 +75,7 @@ public LibrariesIndexer(File preferencesFolder) {
7675
}
7776

7877
public void parseIndex() throws IOException {
79-
index = new EmptyLibrariesIndex(); // Fallback
78+
index = new LibrariesIndex(); // Fallback
8079

8180
if (!indexFile.exists()) {
8281
return;
@@ -92,7 +91,6 @@ private void parseIndex(File file) throws IOException {
9291
try {
9392
indexIn = new FileInputStream(file);
9493
ObjectMapper mapper = new ObjectMapper();
95-
mapper.registerModule(new MrBeanModule());
9694
mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
9795
mapper.configure(DeserializationFeature.EAGER_DESERIALIZER_FETCH, true);
9896
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

‎arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929

3030
package cc.arduino.contributions.packages;
3131

32-
public interface ContributedBoard {
32+
public class ContributedBoard {
3333

34-
String getName();
34+
private String name;
35+
public String getName() { return name; }
3536

3637
}

‎arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929

3030
package cc.arduino.contributions.packages;
3131

32-
public abstract class ContributedHelp {
32+
public class ContributedHelp {
3333

34-
public abstract String getOnline();
34+
private String online;
35+
public String getOnline() { return online; }
3536

3637
}

‎arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java

+16-8
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,31 @@
2929

3030
package cc.arduino.contributions.packages;
3131

32+
import java.util.ArrayList;
3233
import java.util.List;
3334

34-
public abstract class ContributedPackage {
35+
public class ContributedPackage {
3536

36-
public abstract String getName();
37+
private String name;
38+
public String getName() { return name; }
3739

38-
public abstract String getMaintainer();
40+
private String maintainer;
41+
public String getMaintainer() { return maintainer; }
3942

40-
public abstract String getWebsiteURL();
43+
private String websiteURL;
44+
public String getWebsiteURL() { return websiteURL; }
4145

42-
public abstract String getEmail();
46+
private String email;
47+
public String getEmail() { return email; }
4348

44-
public abstract List<ContributedPlatform> getPlatforms();
49+
private ArrayList<ContributedPlatform> platforms = new ArrayList<ContributedPlatform>();
50+
public List<ContributedPlatform> getPlatforms() { return platforms; }
4551

46-
public abstract List<ContributedTool> getTools();
52+
private ArrayList<ContributedTool> tools = new ArrayList<ContributedTool>();
53+
public List<ContributedTool> getTools() { return tools; }
4754

48-
public abstract ContributedHelp getHelp();
55+
private ContributedHelp help;
56+
public ContributedHelp getHelp() { return help; }
4957

5058
private boolean trusted;
5159

‎arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java

+27-9
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,42 @@
3535
import java.io.File;
3636
import java.util.*;
3737

38-
public abstract class ContributedPlatform extends DownloadableContribution {
38+
public class ContributedPlatform extends DownloadableContribution {
3939

40-
public abstract String getName();
40+
private String url;
41+
public String getUrl() { return url; }
4142

42-
public abstract String getCategory();
43+
private String version;
44+
public String getVersion() { return version; }
4345

44-
public abstract void setCategory(String category);
46+
private long size;
47+
public long getSize() { return size; }
4548

46-
public abstract String getArchitecture();
49+
private String archiveFileName;
50+
public String getArchiveFileName() { return archiveFileName; }
4751

52+
private String name;
53+
public String getName() { return name; }
54+
55+
private String category;
56+
public String getCategory() { return category; }
57+
public void setCategory(String category) { this.category = category; }
58+
59+
private String architecture;
60+
public String getArchitecture() { return architecture; }
61+
62+
private String checksum;
4863
@Override
49-
public abstract String getChecksum();
64+
public String getChecksum() { return checksum; }
5065

51-
public abstract List<ContributedToolReference> getToolsDependencies();
66+
private ArrayList<ContributedToolReference> toolsDependencies = new ArrayList<ContributedToolReference>();
67+
public List<ContributedToolReference> getToolsDependencies() { return toolsDependencies; }
5268

53-
public abstract List<ContributedBoard> getBoards();
69+
private ArrayList<ContributedBoard> boards = new ArrayList<ContributedBoard>();
70+
public List<ContributedBoard> getBoards() { return boards; }
5471

55-
public abstract ContributedHelp getHelp();
72+
private ContributedHelp help;
73+
public ContributedHelp getHelp() { return help; }
5674

5775
private boolean installed;
5876

‎arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,19 @@
3333
import processing.app.Platform;
3434

3535
import java.io.File;
36+
import java.util.ArrayList;
3637
import java.util.List;
3738

38-
public abstract class ContributedTool {
39+
public class ContributedTool {
3940

40-
public abstract String getName();
41+
private String name;
42+
public String getName() { return name; }
4143

42-
public abstract String getVersion();
44+
private String version;
45+
public String getVersion() { return version; }
4346

44-
public abstract List<HostDependentDownloadableContribution> getSystems();
47+
private ArrayList<HostDependentDownloadableContribution> systems = new ArrayList<HostDependentDownloadableContribution>();
48+
public List<HostDependentDownloadableContribution> getSystems() { return systems; }
4549

4650
private boolean installed;
4751

0 commit comments

Comments
 (0)