github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#2401] Bad package name generated when <packageName/> contents are not

Browse Source 
trimmed
This commit is contained in:
Lukas Eder 2013-04-28 13:07:20 +02:00
parent d97840ec66
commit c5df4f8db9
3 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
jOOQ-meta/src/main/java/org/jooq/util/jaxb/tools/TrimAdapter.java Normal file
View File

@ -0,0 +1,61 @@
/**
* Copyright (c) 2009-2013, Lukas Eder, lukas.eder@gmail.com
* All rights reserved.
*
* This software is licensed to you under the Apache License, Version 2.0
* (the "License"); You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* . Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* . Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* . Neither the name "jOOQ" nor the names of its contributors may be
* used to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
package org.jooq.util.jaxb.tools;
import javax.xml.bind.annotation.adapters.XmlAdapter;
/**
* [#2401] A string-trimming {@link XmlAdapter} that takes out whitespace from
* JAXB-bound XML content.
*
* @author Lukas Eder
*/
public class TrimAdapter extends XmlAdapter<String, String> {
@Override
public String unmarshal(String v) throws Exception {
if (v == null)
return null;
return v.trim();
}
@Override
public String marshal(String v) throws Exception {
if (v == null)
return null;
return v.trim();
}
}

3
jOOQ-meta/src/main/resources/xjb/binding.xjb
View File

@ -12,6 +12,9 @@
<!-- Force all classes implements Serializable -->
<xjc:serializable uid="300" />
<!-- [#2401] Trim unnecessary whitespace from configuration -->
<xjc:javaType name="java.lang.String" xmlType="xs:string" adapter="org.jooq.util.jaxb.tools.TrimAdapter"/>
</jaxb:globalBindings>

21
jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
View File

@ -94,16 +94,27 @@
<records>false</records>
<pojos>false</pojos>
<navigationMethods>true</navigationMethods>
<deprecated>true</deprecated>
<instanceFields>false</instanceFields>
<!-- [#2401] Be sure that excess whitespace is trimmed by JAXB -->
<navigationMethods>
true
</navigationMethods>
<deprecated>
true
</deprecated>
<instanceFields>
false
</instanceFields>
<generatedAnnotation>false</generatedAnnotation>
<interfaces>true</interfaces>
<jpaAnnotations>false</jpaAnnotations>
</generate>
<target>
<packageName>org.jooq.test.h2.generatedclasses</packageName>
<directory>./src</directory>
<packageName>
org.jooq.test.h2.generatedclasses
</packageName>
<directory>
./src
</directory>
</target>
</generator>
</configuration>