Skip to content

Commit cfe329f

Browse files
TanyaEfTanyaEf
authored
Merge pull request #226 from Jaspersoft/revert-225-master
Revert "Refactoring in ConnectionMediaType"
2 parents 6b2b289 + ad1df1b commit cfe329f

File tree

2 files changed

+78
-28
lines changed

2 files changed

+78
-28
lines changed

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ConnectionMediaType.java‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,47 @@
2121

2222
package com.jaspersoft.jasperserver.jaxrs.client.core.enums;
2323

24-
public interface ConnectionMediaType {
24+
public final class ConnectionMediaType {
2525

26-
String FTP_TYPE = "application/connections.ftp";
27-
String FTP_JSON = "application/connections.ftp+json";
28-
String FTP_XML = "application/connections.ftp+xml";
26+
public static final String FTP_TYPE = "application/connections.ftp";
27+
public static final String FTP_JSON = "application/connections.ftp+json";
28+
public static final String FTP_XML = "application/connections.ftp+xml";
2929

30-
String LOCAL_FILE_SYSTEM_TYPE = "application/connections.lfs";
31-
String LOCAL_FILE_SYSTEM_JSON = "application/connections.lfs+json";
32-
String LOCAL_FILE_SYSTEM_XML = "application/connections.lfs+xml";
30+
public static final String LOCAL_FILE_SYSTEM_TYPE = "application/connections.lfs";
31+
public static final String LOCAL_FILE_SYSTEM_JSON = "application/connections.lfs+json";
32+
public static final String LOCAL_FILE_SYSTEM_XML = "application/connections.lfs+xml";
3333

34-
String CUSTOM_DATA_SOURCE_TYPE = "application/repository.customDataSource";
35-
String CUSTOM_DATA_SOURCE_JSON = "application/repository.customDataSource+json";
36-
String CUSTOM_DATA_SOURCE_XML = "application/repository.customDataSource+xml";
34+
public static final String CUSTOM_DATA_SOURCE_TYPE = "application/repository.customDataSource";
35+
public static final String CUSTOM_DATA_SOURCE_JSON = "application/repository.customDataSource+json";
36+
public static final String CUSTOM_DATA_SOURCE_XML = "application/repository.customDataSource+xml";
3737

38-
String CUSTOM_DATA_SOURCE_METADATA_TYPE = "application/table.metadata";
39-
String CUSTOM_DATA_SOURCE_METADATA_JSON = "application/table.metadata+json";
40-
String CUSTOM_DATA_SOURCE_METADATA_XML = "application/table.metadata+xml";
38+
public static final String CUSTOM_DATA_SOURCE_METADATA_TYPE = "application/table.metadata";
39+
public static final String CUSTOM_DATA_SOURCE_METADATA_JSON = "application/table.metadata+json";
40+
public static final String CUSTOM_DATA_SOURCE_METADATA_XML = "application/table.metadata+xml";
4141

42-
String JNDI_JDBC_DATA_SOURCE_TYPE = "application/repository.jndiJdbcDataSource";
43-
String JNDI_JDBC_DATA_SOURCE_JSON = "application/repository.jndiJdbcDataSource+json";
44-
String JNDI_JDBC_DATA_SOURCE_XML = "application/repository.jndiJdbcDataSource+xml";
42+
public static final String JNDI_JDBC_DATA_SOURCE_TYPE = "application/repository.jndiJdbcDataSource";
43+
public static final String JNDI_JDBC_DATA_SOURCE_JSON = "application/repository.jndiJdbcDataSource+json";
44+
public static final String JNDI_JDBC_DATA_SOURCE_XML = "application/repository.jndiJdbcDataSource+xml";
4545

46-
String JDBC_DATA_SOURCE_TYPE = "application/repository.jdbcDataSource";
47-
String JDBC_DATA_SOURCE_JSON = "application/repository.jdbcDataSource+json";
48-
String JDBC_DATA_SOURCE_XML = "application/repository.jdbcDataSource+xml";
46+
public static final String JDBC_DATA_SOURCE_TYPE = "application/repository.jdbcDataSource";
47+
public static final String JDBC_DATA_SOURCE_JSON = "application/repository.jdbcDataSource+json";
48+
public static final String JDBC_DATA_SOURCE_XML = "application/repository.jdbcDataSource+xml";
4949

50-
String JDBC_DATA_SOURCE_METADATA_TYPE = "application/repository.customDataSource.metadata";
51-
String JDBC_DATA_SOURCE_METADATA_JSON = "application/repository.customDataSource.metadata+json";
52-
String JDBC_DATA_SOURCE_METADATA_XML = "application/repository.customDataSource.metadata+xml";
50+
public static final String JDBC_DATA_SOURCE_METADATA_TYPE = "application/repository.customDataSource.metadata";
51+
public static final String JDBC_DATA_SOURCE_METADATA_JSON = "application/repository.customDataSource.metadata+json";
52+
public static final String JDBC_DATA_SOURCE_METADATA_XML = "application/repository.customDataSource.metadata+xml";
5353

54-
String TXT_FILE_TYPE = "application/connections.txtFile";
55-
String TXT_FILE_JSON = "application/connections.txtFile+json";
56-
String TXT_FILE_XML = "application/connections.txtFile+xml";
54+
public static final String DOMAIN_DATA_SOURCE_TYPE = "application/repository.domain";
55+
public static final String DOMAIN_DATA_SOURCE_JSON = "application/repository.domain+json";
56+
public static final String DOMAIN_DATA_SOURCE_XML = "application/repository.domain+xml";
5757

58-
String XLS_FILE_TYPE = "application/connections.xlsFile";
59-
String XLS_FILE_JSON = "application/connections.xlsFile+json";
60-
String XLS_FILE_XML = "application/connections.xlsFile+xml";
58+
public static final String TXT_FILE_TYPE = "application/connections.txtFile";
59+
public static final String TXT_FILE_JSON = "application/connections.txtFile+json";
60+
public static final String TXT_FILE_XML = "application/connections.txtFile+xml";
6161

62+
public static final String XLS_FILE_TYPE = "application/connections.xlsFile";
63+
public static final String XLS_FILE_JSON = "application/connections.xlsFile+json";
64+
public static final String XLS_FILE_XML = "application/connections.xlsFile+xml";
65+
66+
private ConnectionMediaType(){}
6267
}

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/connections/ConnectionMediaTypeTest.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.connections;
2+
3+
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ConnectionMediaType;
4+
import org.testng.annotations.Test;
5+
6+
import java.lang.reflect.Constructor;
7+
import java.lang.reflect.InvocationTargetException;
8+
9+
import static org.testng.Assert.assertEquals;
10+
import static org.testng.Assert.assertFalse;
11+
import static org.testng.Assert.assertNotNull;
12+
13+
/**
14+
* Unit test for {@link com.jaspersoft.jasperserver.jaxrs.client.core.enums.ConnectionMediaType}
15+
*/
16+
public class ConnectionMediaTypeTest {
17+
18+
@Test
19+
public void should_return_proper_value() {
20+
assertEquals(ConnectionMediaType.FTP_JSON, "application/connections.ftp+json");
21+
assertEquals(ConnectionMediaType.FTP_XML, "application/connections.ftp+xml");
22+
assertEquals(ConnectionMediaType.LOCAL_FILE_SYSTEM_JSON, "application/connections.lfs+json");
23+
assertEquals(ConnectionMediaType.LOCAL_FILE_SYSTEM_XML, "application/connections.lfs+xml");
24+
assertEquals(ConnectionMediaType.TXT_FILE_JSON, "application/connections.txtFile+json");
25+
assertEquals(ConnectionMediaType.TXT_FILE_XML, "application/connections.txtFile+xml");
26+
assertEquals(ConnectionMediaType.XLS_FILE_JSON, "application/connections.xlsFile+json");
27+
assertEquals(ConnectionMediaType.XLS_FILE_XML, "application/connections.xlsFile+xml");
28+
}
29+
30+
@Test
31+
public void constructor_of_enum_should_be_private() {
32+
Constructor<?>[] constructors = ConnectionMediaType.class.getDeclaredConstructors();
33+
assertFalse(constructors[0].isAccessible());
34+
}
35+
36+
@Test
37+
public void magic() throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException {
38+
39+
Constructor<ConnectionMediaType> constructor = ConnectionMediaType.class.getDeclaredConstructor();
40+
constructor.setAccessible(true);
41+
ConnectionMediaType instance = constructor.newInstance();
42+
43+
assertNotNull(instance);
44+
}
45+
}

0 commit comments

Comments
 (0)