Skip to content

Commit c8ed0d6

Browse files
raydacraydac
committed
release 2.0.0
1 parent 4e01b02 commit c8ed0d6

File tree

19 files changed

+76
-45
lines changed

19 files changed

+76
-45
lines changed

‎.projectKnowledge/JBBP.mmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ Mind Map generated by NB MindMap plugin
1616
> fillColor=`#CCCCFF`,leftSide=`true`
1717

1818

19-
### Java 6\+
19+
### Java 1\.8\+
2020
> fillColor=`#3399FF`,textColor=`#FFFFCC`
2121

2222

23-
### Android 2\.0\+
23+
### Android 3\.0\+
2424
> fillColor=`#3399FF`,textColor=`#FFFFCC`
2525

2626

@@ -106,7 +106,7 @@ Mind Map generated by NB MindMap plugin
106106
> fillColor=`#D1FF9C`,topicLinkUID=`15E33F384B4A`
107107

108108
- FILE
109-
<pre>jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJava6Converter.java</pre>
109+
<pre>jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/conversion/JBBPToJavaConverter.java</pre>
110110

111111
#### Maven plugin
112112
> fillColor=`#D1FF9C`

‎README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ For instance I have been very actively using the framework in [the ZX-Poly emula
1515
![Use cases](https://github.com/raydac/java-binary-block-parser/blob/master/docs/jbbp_mm.png)
1616

1717
# Change log
18-
- **2.0.0-SNAPSHOT**
18+
- **2.0.0 (20-nov-2019)**
1919
- __removed DslBinCustom annotation, use @Bin annotation instead__
2020
- __renamed attributes of @Bin annotation to their correct form__
2121
- __reworked object mapping system, removed hacks to instantiate classes, now only mapping to objects allowed, support of private fields mapping is removed__
2222
- __minimal JDK version now 1.8+__
2323
- __minimal Android API now 3.0+__
2424
- added support of getters and setters into mapping
25-
- added `Object newInstance(Class)` method support of mapped classes to generate instances for local classes
25+
- added `Object newInstance(Class)` method support of mapped classes to generate local class member instances
2626
- added generating of `makeFIELD()` method for structure types in Java class converter
2727
- refactoring
2828

@@ -67,7 +67,7 @@ The Framework has been published in the Maven Central and can be easily added as
6767
<dependency>
6868
<groupId>com.igormaznitsa</groupId>
6969
<artifactId>jbbp</artifactId>
70-
<version>1.4.1</version>
70+
<version>2.0.0</version>
7171
</dependency>
7272
```
7373
the precompiled library jar, javadoc and sources also can be downloaded directly from [the Maven central.](http://search.maven.org/#browse|808871750)
@@ -83,7 +83,7 @@ The Easiest case below shows how to parse byte array to bits.
8383
Of course sometime it is not a comfortable way to look for parsed fields in the result, so you can use mapping of parsed data to class fields.
8484
```Java
8585
class Parsed {@Bin(type = BinType.BIT_ARRAY)byte[] parsed;}
86-
Parsed parsedBits = JBBPParser.prepare("bit:1 [_] parsed;").parse(new byte[]{1,2,3,4,5}).mapTo(Parsed.class);
86+
Parsed parsedBits = JBBPParser.prepare("bit:1 [_] parsed;").parse(new byte[]{1,2,3,4,5}).mapTo(new Parsed());
8787
```
8888

8989
# Relative speed of different approaches in parsing
@@ -100,7 +100,7 @@ Since 1.3.0 version, the framework can convert JBBP scripts into sources __(the
100100
For instance you can use such simple snippet to generate Java classes from JBBP script, potentially it can generate many classes but usually only one class
101101
```Java
102102
JBBPParser parser = JBBPParser.prepare("byte a; byte b; byte c;");
103-
List<ResultSrcItem> generated = parser.convertToSrc(TargetSources.JAVA_1_6,"com.test.jbbp.gen.SomeClazz");
103+
List<ResultSrcItem> generated = parser.convertToSrc(TargetSources.JAVA,"com.test.jbbp.gen.SomeClazz");
104104
for(ResultSrcItem i : generated) {
105105
for(Map.Entry<String,String> j :i.getResult().entrySet()) {
106106
System.out.println("Class file name "+j.getKey());
@@ -114,7 +114,7 @@ in Maven you should just add such plugin execution
114114
<plugin>
115115
<groupId>com.igormaznitsa</groupId>
116116
<artifactId>jbbp-maven-plugin</artifactId>
117-
<version>1.4.1</version>
117+
<version>2.0.0</version>
118118
<executions>
119119
<execution>
120120
<id>gen-jbbp-src</id>
@@ -138,7 +138,7 @@ class Flags {
138138
}
139139

140140
final int data = 0b10101010;
141-
Flags parsed = JBBPParser.prepare("bit:1 f1; bit:2 f2; bit:1 f3; bit:4 f4;", JBBPBitOrder.MSB0).parse(new byte[]{(byte)data}).mapTo(Flags.class);
141+
Flags parsed = JBBPParser.prepare("bit:1 f1; bit:2 f2; bit:1 f3; bit:4 f4;", JBBPBitOrder.MSB0).parse(new byte[]{(byte)data}).mapTo(new Flags());
142142
assertEquals(1,parsed.flag1);
143143
assertEquals(2,parsed.flag2);
144144
assertEquals(0,parsed.flag3);
@@ -302,9 +302,12 @@ final JBBPParser pngParser = JBBPParser.prepare(
302302
class Png {
303303
long header;
304304
Chunk [] chunk;
305+
public Object newInstance(Class<?> klazz){
306+
return klazz == Chunk.class ? new Chunk() : null;
307+
}
305308
}
306309

307-
final Png png = pngParser.parse(pngStream).mapTo(Png.class);
310+
final Png png = pngParser.parse(pngStream).mapTo(new Png());
308311
```
309312
The Example from tests shows how to parse a tcp frame wrapped in a network frame
310313
```Java

‎changelog.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
2.0.0-SNAPSHOT
1+
2.0.0
22
- __removed DslBinCustom annotation, use @Bin annotation instead__
33
- __renamed attributes of @Bin annotation to their correct form__
44
- __reworked object mapping system, removed hacks to instantiate classes, now only mapping to objects allowed, support of private fields mapping is removed__
55
- __minimal JDK version now 1.8+__
66
- __minimal Android API now 3.0+__
77
- added support of getters and setters into mapping
8-
- added `Object newInstance(Class)` method support of mapped classes to generate instances for local classes
8+
- added `Object newInstance(Class)` method support of mapped classes to generate local class member instances
99
- added generating of `makeFIELD()` method for structure types in Java class converter
1010
- refactoring
1111

‎docs/jbbp_mm.png

59.5 KB
Loading

‎jbbp-plugins/jbbp-gradle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def getProp(name, dflt) {
77
}
88
}
99

10-
def jbbpVersion = getProp('jbbp_plugin_version', '2.0.0-SNAPSHOT')
10+
def jbbpVersion = getProp('jbbp_plugin_version', '2.0.0')
1111
def metaLibVersion = getProp('meta_lib_version', '1.1.2')
1212

1313
group = 'com.igormaznitsa'

‎jbbp-plugins/jbbp-gradle/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.igormaznitsa</groupId>
88
<artifactId>jbbp-main-plugin-pom</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>2.0.0</version>
1010
</parent>
1111

1212
<artifactId>jbbp-gradle-plugin</artifactId>
@@ -22,6 +22,8 @@
2222
</dependencies>
2323

2424
<properties>
25+
<maven.compiler.source>1.8</maven.compiler.source>
26+
<maven.compiler.target>1.8</maven.compiler.target>
2527
<gradleGoal>install</gradleGoal>
2628
</properties>
2729

‎jbbp-plugins/jbbp-maven/jbbp-maven-plugin-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.igormaznitsa</groupId>
77
<artifactId>jbbp-maven-plugin-pom</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0</version>
99
</parent>
1010

1111
<artifactId>jbbp-maven-plugin-tests</artifactId>

‎jbbp-plugins/jbbp-maven/jbbp-maven-plugin/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.igormaznitsa</groupId>
77
<artifactId>jbbp-maven-plugin-pom</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0</version>
99
</parent>
1010

1111
<artifactId>jbbp-maven-plugin</artifactId>
@@ -14,6 +14,11 @@
1414
<name>JBBP Maven plugin</name>
1515
<description>Generator of sources from JBBP scripts</description>
1616

17+
<properties>
18+
<maven.compiler.source>1.8</maven.compiler.source>
19+
<maven.compiler.target>1.8</maven.compiler.target>
20+
</properties>
21+
1722
<profiles>
1823
<profile>
1924
<id>publish</id>
@@ -61,6 +66,9 @@
6166
<goals>
6267
<goal>jar</goal>
6368
</goals>
69+
<configuration>
70+
<source>1.8</source>
71+
</configuration>
6472
</execution>
6573
</executions>
6674
</plugin>

‎jbbp-plugins/jbbp-maven/jbbp-maven-plugin/src/test/resources/com/igormaznitsa/jbbp/plugin/mvn/mojoConfig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<plugin>
1515
<groupId>com.igormaznitsa</groupId>
1616
<artifactId>jbbp-maven-plugin</artifactId>
17-
<version>2.0.0-SNAPSHOT</version>
17+
<version>2.0.0</version>
1818
<goals>
1919
<goal>generate</goal>
2020
</goals>

‎jbbp-plugins/jbbp-maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.igormaznitsa</groupId>
77
<artifactId>jbbp-main-plugin-pom</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0</version>
99
</parent>
1010

1111
<artifactId>jbbp-maven-plugin-pom</artifactId>

0 commit comments

Comments
 (0)