Migrating from Springboot 1.x to 2.x along with other associated
libraries.
Issue-ID: PORTAL-892
Signed-off-by: sp931a <sp931a@att.com>
Change-Id: Ibb88c867059218cc0e7694c4a654d1856638d412
13 files changed:
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.11.RELEASE</version>
+ <version>2.2.5.RELEASE</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <hibernate.version>4.3.11.Final</hibernate.version>
+ <hibernate.version>5.4.14.Final</hibernate.version>
<skipTests>false</skipTests>
<!-- Replicate this from OParent -->
<skipTests>false</skipTests>
<!-- Replicate this from OParent -->
- <jacocoVersion>0.7.6.201602180812</jacocoVersion>
+ <jacocoVersion>0.8.2</jacocoVersion>
</properties>
<dependencies>
</properties>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <!-- <version>${hibernate.version}</version> -->
+ <version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <!-- <version>1.6.1</version> -->
+ <version>1.6.1</version>
<exclusions>
<exclusion>
<groupId>jaxme</groupId>
<exclusions>
<exclusion>
<groupId>jaxme</groupId>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>8.5.28</version>
+ <version>9.0.33</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>4.2.13.RELEASE</version>
+ <version>5.2.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@Value("${server.port}")
String port;
@Value("${server.port}")
String port;
- @Value("${server.contextPath}")
+ @Value("${server.servlet.context-path}")
- @Value("${security.user.name}")
+ @Value("${spring.security.user.name}")
- @Value("${security.user.password}")
+ @Value("${spring.security.user.password}")
String security_pass;
@Autowired
String security_pass;
@Autowired
@Id
@Column(name = "APP_ID")
@Id
@Column(name = "APP_ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
@Digits(integer = 11, fraction = 0)
private Long appId;
@Digits(integer = 11, fraction = 0)
private Long appId;
@Id
@Column(name = "id")
@Digits(integer = 11, fraction = 0)
@Id
@Column(name = "id")
@Digits(integer = 11, fraction = 0)
- @GeneratedValue(strategy=GenerationType.AUTO)
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
private Long id;
@Column(name = "name")
private Long id;
@Column(name = "name")
- @GeneratedValue(strategy=GenerationType.AUTO)
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
@Digits(integer = 11, fraction = 0)
private Long id;
@Digits(integer = 11, fraction = 0)
private Long id;
@Id
@Column(name = "ROLE_ID")
@Id
@Column(name = "ROLE_ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
@Digits(integer = 11, fraction = 0)
private Long roleId;
@Digits(integer = 11, fraction = 0)
private Long roleId;
@Id
@Column(name = "widget_id")
@Id
@Column(name = "widget_id")
- @GeneratedValue(strategy=GenerationType.AUTO)
+ @GeneratedValue(strategy=GenerationType.IDENTITY)
@Digits(integer = 11, fraction = 0)
private long id;
@Digits(integer = 11, fraction = 0)
private long id;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
Transaction tx = session.beginTransaction();
session.save(newService);
tx.commit();
Transaction tx = session.beginTransaction();
session.save(newService);
tx.commit();
session.close();
}
catch(Exception e){
session.close();
}
catch(Exception e){
Transaction tx = session.beginTransaction();
session.save(newParameter);
tx.commit();
Transaction tx = session.beginTransaction();
session.save(newParameter);
tx.commit();
session.close();
}
catch(Exception e){
session.close();
}
catch(Exception e){
List<MicroserviceData> services = criteria.list();
logger.debug("MicroserviceServiceImpl.getMicroserviceByName: result={}", services);
List<MicroserviceData> services = criteria.list();
logger.debug("MicroserviceServiceImpl.getMicroserviceByName: result={}", services);
session.close();
return (services.size() > 0) ? services.get(0).getId() : null;
session.close();
return (services.size() > 0) ? services.get(0).getId() : null;
Transaction tx = session.beginTransaction();
session.save(newWidgetCatalog);
tx.commit();
Transaction tx = session.beginTransaction();
session.save(newWidgetCatalog);
tx.commit();
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}
Transaction tx = session.beginTransaction();
session.update(newWidgetCatalog);
tx.commit();
Transaction tx = session.beginTransaction();
session.update(newWidgetCatalog);
tx.commit();
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}catch(Exception e){
session.close();
updateAppId(newWidgetCatalog.getId(), newWidgetCatalog.getWidgetRoles());
}catch(Exception e){
List<MicroserviceData> widgets = criteria.list();
logger.debug("WidgetCatalogServiceImpl.getWidgetIdByName: result={}", widgets);
List<MicroserviceData> widgets = criteria.list();
logger.debug("WidgetCatalogServiceImpl.getWidgetIdByName: result={}", widgets);
session.close();
return (widgets.size() > 0) ? true : false;
session.close();
return (widgets.size() > 0) ? true : false;
## General App Properties
## General App Properties
-server.contextPath=/widget
+server.servlet.context-path=/widget
-spring.http.multipart.max-file-size=128MB
-spring.http.multipart.max-request-size=128MB
+spring.servlet.multipart.max-file-size=128MB
+spring.servlet.multipart.max-request-size=128MB
microservice.widget.location=/tmp
## App DB Properties
spring.datasource.url=jdbc:mariadb://localhost:3306/portal
spring.datasource.username=root
microservice.widget.location=/tmp
## App DB Properties
spring.datasource.url=jdbc:mariadb://localhost:3306/portal
spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=welcome2ibm
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
spring.database.driver.classname=org.mariadb.jdbc.Driver
spring.jpa.show-sql=false
spring.jpa.properties.hibernate.format_sql=false
## Basic Authentication Properties
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
spring.database.driver.classname=org.mariadb.jdbc.Driver
spring.jpa.show-sql=false
spring.jpa.properties.hibernate.format_sql=false
## Basic Authentication Properties
-security.user.name=widget_user
-security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)
+spring.security.user.name=widget_user
+spring.security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)
account.user.name=portal
account.user.password=6APqvG4AU2rfLgCvMdySwQ==
account.user.name=portal
account.user.password=6APqvG4AU2rfLgCvMdySwQ==
import org.onap.portalapp.widget.domain.App;
import org.onap.portalapp.widget.domain.RoleApp;
import org.onap.portalapp.widget.domain.WidgetCatalog;
import org.onap.portalapp.widget.domain.App;
import org.onap.portalapp.widget.domain.RoleApp;
import org.onap.portalapp.widget.domain.WidgetCatalog;
+import org.hibernate.query.NativeQuery;
public class WidgetCatalogServiceImplTest {
public class WidgetCatalogServiceImplTest {
@Before
public void init() {
@Before
public void init() {
List<WidgetCatalog> list = new ArrayList<WidgetCatalog>();
WidgetCatalog widget = new WidgetCatalog();
list.add(widget);
List<WidgetCatalog> list = new ArrayList<WidgetCatalog>();
WidgetCatalog widget = new WidgetCatalog();
list.add(widget);
- Mockito.when(widgetService.getWidgetCatalog()).thenReturn(list);
+ Mockito.lenient().when(widgetService.getWidgetCatalog()).thenReturn(list);
mockMvc.perform(get("/microservices/widgetCatalog/"))
.andExpect(status().isBadRequest());
mockMvc.perform(get("/microservices/widgetCatalog/"))
.andExpect(status().isBadRequest());
widget.setId(1);
widget.setName("junit");
list.add(widget);
widget.setId(1);
widget.setName("junit");
list.add(widget);
- Mockito.when(widgetService.getUserWidgetCatalog("test")).thenReturn(list);
+ Mockito.lenient().when(widgetService.getUserWidgetCatalog("test")).thenReturn(list);
String security_user = "user";
String security_pass = "password";
String security_user = "user";
String security_pass = "password";
widget.setId(1);
widget.setName("junit");
list.add(widget);
widget.setId(1);
widget.setName("junit");
list.add(widget);
- Mockito.when(widgetService.getUserWidgetCatalog("test")).thenReturn(list);
+ Mockito.lenient().when(widgetService.getUserWidgetCatalog("test")).thenReturn(list);
String security_user = "user";
String security_pass = "password";
String security_user = "user";
String security_pass = "password";
@Test
public void saveWidgetCatalog_ValidAuthorization_NoError() throws Exception {
ValidationRespond respond = new ValidationRespond(true, null);
@Test
public void saveWidgetCatalog_ValidAuthorization_NoError() throws Exception {
ValidationRespond respond = new ValidationRespond(true, null);
- Mockito.when(storageService.checkZipFile(any(MultipartFile.class))).thenReturn(respond);
+ Mockito.lenient().when(storageService.checkZipFile(any(MultipartFile.class))).thenReturn(respond);
String security_user = "user";
String security_pass = "password";
String security_user = "user";
String security_pass = "password";
@Test
public void saveWidgetCatalog_Authorization_Error() throws Exception {
ValidationRespond respond = new ValidationRespond(true, null);
@Test
public void saveWidgetCatalog_Authorization_Error() throws Exception {
ValidationRespond respond = new ValidationRespond(true, null);
- Mockito.when(storageService.checkZipFile(any(MultipartFile.class))).thenReturn(respond);
+ Mockito.lenient().when(storageService.checkZipFile(any(MultipartFile.class))).thenReturn(respond);
String security_user = "user";
String security_pass = "password";
String security_user = "user";
String security_pass = "password";
@Test
public void updateWidgetCatalogwithFiles_ValidAuthorization_NoError() throws Exception {
ValidationRespond respond = new ValidationRespond(true, null);
@Test
public void updateWidgetCatalogwithFiles_ValidAuthorization_NoError() throws Exception {
ValidationRespond respond = new ValidationRespond(true, null);
- Mockito.when(storageService.checkZipFile(any(MultipartFile.class))).thenReturn(respond);
+ Mockito.lenient().when(storageService.checkZipFile(any(MultipartFile.class))).thenReturn(respond);
String security_user = "user";
String security_pass = "password";
String security_user = "user";
String security_pass = "password";
widget.setId(1);
widget.setName("junit");
list.add(widget);
widget.setId(1);
widget.setName("junit");
list.add(widget);
- Mockito.when(widgetService.getWidgetsByServiceId(serviceId)).thenReturn(list);
+ Mockito.lenient().when(widgetService.getWidgetsByServiceId(serviceId)).thenReturn(list);
String security_user = "user";
String security_pass = "password";
String security_user = "user";
String security_pass = "password";
String wrong_pass = "wrong";
Long widgetId = new Long(1);
byte[] bytes="Test".getBytes();
String wrong_pass = "wrong";
Long widgetId = new Long(1);
byte[] bytes="Test".getBytes();
- Mockito.when(storageService.getWidgetCatalogContent(widgetId)).thenReturn(bytes);
+ Mockito.lenient().when(storageService.getWidgetCatalogContent(widgetId)).thenReturn(bytes);
ReflectionTestUtils.setField(controller, "security_user", security_user, String.class);
ReflectionTestUtils.setField(controller, "security_pass", security_pass, String.class);
ReflectionTestUtils.setField(controller, "security_user", security_user, String.class);
ReflectionTestUtils.setField(controller, "security_pass", security_pass, String.class);