Skip to content

Commit 42e513f

Browse files
committed
Fix issues for sonar cloud scan #51
1 parent fc8c694 commit 42e513f

File tree

7 files changed

+44
-14
lines changed

7 files changed

+44
-14
lines changed

fj-doc-base-json/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacadeSourceJson.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.fail;
55

6-
import org.fugerit.java.doc.base.config.DocException;
76
import org.fugerit.java.doc.base.facade.DocFacadeSource;
87
import org.junit.Test;
98
import org.slf4j.Logger;
@@ -18,7 +17,7 @@ private void textSupportedParser( boolean expected, int sourceType ) {
1817
try {
1918
supported = DocFacadeSource.getInstance().isSourceSupported(sourceType);
2019
assertEquals( "Failed doc parser supported check", expected , supported );
21-
} catch (DocException e) {
20+
} catch (Exception e) {
2221
String message = "Error : "+e;
2322
logger.error( message, e );
2423
fail( message );

fj-doc-base-yaml/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacadeSourceYaml.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.fail;
55

6-
import org.fugerit.java.doc.base.config.DocException;
76
import org.fugerit.java.doc.base.facade.DocFacadeSource;
87
import org.junit.Test;
98
import org.slf4j.Logger;
@@ -18,7 +17,7 @@ private void textSupportedParser( boolean expected, int sourceType ) {
1817
try {
1918
supported = DocFacadeSource.getInstance().isSourceSupported(sourceType);
2019
assertEquals( "Failed doc parser supported check", expected , supported );
21-
} catch (DocException e) {
20+
} catch (Exception e) {
2221
String message = "Error : "+e;
2322
logger.error( message, e );
2423
fail( message );

fj-doc-base/src/main/java/org/fugerit/java/doc/base/facade/DocFacadeSource.java

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,20 @@
1212
import org.slf4j.Logger;
1313
import org.slf4j.LoggerFactory;
1414

15+
import lombok.Getter;
16+
1517
public class DocFacadeSource {
1618

17-
private DocFacadeSource() {} // java:S1118
19+
@Getter private DocFacadeSourceConfig docFacadeSourceConfig;
20+
21+
public DocFacadeSource(DocFacadeSourceConfig docFacadeSourceConfig) {
22+
super();
23+
this.docFacadeSourceConfig = docFacadeSourceConfig;
24+
}
25+
26+
public DocFacadeSource() {
27+
this( DocFacadeSourceConfig.DEFAULT_CONFIG );
28+
}
1829

1930
public static final int SOURCE_TYPE_XML = 1;
2031

@@ -26,10 +37,10 @@ private DocFacadeSource() {} // java:S1118
2637

2738
private static final Logger logger = LoggerFactory.getLogger( DocFacadeSource.class );
2839

29-
private static final DocFacadeSource INSTANCE = new DocFacadeSource();
40+
private static final DocFacadeSource DEFAULT_INSTANCE = new DocFacadeSource();
3041

3142
public static DocFacadeSource getInstance() {
32-
return INSTANCE;
43+
return DEFAULT_INSTANCE;
3344
}
3445

3546
private static final String TYPE_SOURCE_XML = DocXmlParser.class.getName(); // xml parser is always supported
@@ -53,7 +64,11 @@ public DocParser getParserForSource( int sourceType ) {
5364
parser = (DocParser) ClassHelper.newInstance( type );
5465
}
5566
} catch (Exception e) {
56-
logger.warn( "Failed to load parser for source type : {} ({})", sourceType, e.toString() );
67+
if ( this.docFacadeSourceConfig.isFailOnSourceModuleNotFound() ) {
68+
throw new ConfigRuntimeException( "Exception getting parser for sourceType : "+sourceType+" - "+e, e );
69+
} else {
70+
logger.warn( "Failed to load parser for source type : {} ({})", sourceType, e.toString() );
71+
}
5772
}
5873
return parser;
5974
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.fugerit.java.doc.base.facade;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Data;
5+
import lombok.Getter;
6+
import lombok.NoArgsConstructor;
7+
import lombok.With;
8+
9+
@Data
10+
@NoArgsConstructor
11+
@AllArgsConstructor
12+
public class DocFacadeSourceConfig {
13+
14+
public static final DocFacadeSourceConfig DEFAULT_CONFIG = new DocFacadeSourceConfig().withFailOnSourceModuleNotFound(false);
15+
16+
@Getter @With private boolean failOnSourceModuleNotFound;
17+
18+
}

fj-doc-base/src/test/java/test/org/fugerit/java/doc/base/facade/TestDocFacadeSource.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.fail;
55

6-
import org.fugerit.java.doc.base.config.DocException;
76
import org.fugerit.java.doc.base.facade.DocFacadeSource;
87
import org.junit.Test;
98
import org.slf4j.Logger;
@@ -18,7 +17,7 @@ private void textSupportedParser( boolean expected, int sourceType ) {
1817
try {
1918
supported = DocFacadeSource.getInstance().isSourceSupported(sourceType);
2019
assertEquals( "Failed doc parser supported check", expected , supported );
21-
} catch (DocException e) {
20+
} catch (Exception e) {
2221
String message = "Error : "+e;
2322
logger.error( message, e );
2423
fail( message );

fj-doc-playground-quarkus/src/test/java/org/fugerit/java/GreetingResourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import static org.hamcrest.CoreMatchers.is;
88

99
@QuarkusTest
10-
public class GreetingResourceTest {
10+
class GreetingResourceTest {
1111

1212
@Test
13-
public void testHelloEndpoint() {
13+
void testHelloEndpoint() {
1414
given()
1515
.when().get( TestConsts.BASE_API_PATH+"/hello" )
1616
.then()

fj-doc-playground-quarkus/src/test/java/org/fugerit/java/doc/playground/ValRestTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import org.fugerit.java.TestConsts;
1010

1111
@QuarkusTest
12-
public class ValRestTest {
12+
class ValRestTest {
1313

1414
@Test
15-
public void testHelloEndpoint() {
15+
void testHelloEndpoint() {
1616
given()
1717
.when().get( TestConsts.BASE_API_PATH+"/val/supported_extensions" )
1818
.then()

0 commit comments

Comments
 (0)