Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4883880

Browse files
tlkcmaglie
authored andcommitted
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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"/>
-78.8 KB
Binary file not shown.

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

Lines changed: 45 additions & 14 deletions
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 abstractclass 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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@
2929

3030
package cc.arduino.contributions.libraries;
3131

32-
public abstractclass 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

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /