RA-2088 - New major version 2.0.0-SNAPSHOT to require OpenMRS 2.8.2

api/pom.xml

@@ -1,24 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
-
-<!--
-
-    This Source Code Form is subject to the terms of the Mozilla Public License,
-    v. 2.0. If a copy of the MPL was not distributed with this file, You can
-    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
-    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
-
-    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
-    graphic logo is a trademark of OpenMRS Inc.
-
--->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>adminui</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>adminui-api</artifactId>
@@ -34,12 +21,6 @@
 			<artifactId>openmrs-api</artifactId>
 			<type>jar</type>
 		</dependency>
-
-		<dependency>
-			<groupId>org.openmrs.web</groupId>
-			<artifactId>openmrs-web</artifactId>
-			<type>jar</type>
-		</dependency>
 
 		<dependency>
 			<groupId>org.openmrs.api</groupId>
@@ -64,19 +45,19 @@
 
         <!-- End OpenMRS core -->
 
-		<dependency>
-			<groupId>org.openmrs.module</groupId>
-			<artifactId>providermanagement-api</artifactId>
-		</dependency>
-
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>uiframework-api</artifactId>
         </dependency>
 
 		<dependency>
-			<groupId>org.openmrs.module</groupId>
-			<artifactId>legacyui-omod</artifactId>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-inline</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>net.bytebuddy</groupId>
+			<artifactId>byte-buddy</artifactId>
 		</dependency>
 
 	</dependencies>

api/src/main/java/org/openmrs/module/adminui/account/Account.java

@@ -9,29 +9,29 @@
  */
 package org.openmrs.module.adminui.account;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.openmrs.Auditable;
 import org.openmrs.Person;
+import org.openmrs.PersonAttribute;
 import org.openmrs.PersonName;
 import org.openmrs.Provider;
 import org.openmrs.Role;
 import org.openmrs.User;
 import org.openmrs.api.APIException;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.adminui.AdminUiConstants;
+import org.openmrs.util.OpenmrsConstants;
 import org.openmrs.util.OpenmrsUtil;
-import org.openmrs.web.user.UserProperties;
-import org.openmrs.PersonAttribute;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class Account {
 
@@ -209,7 +209,7 @@ public Date getDateChanged() {
 	}
 
 	public boolean isSupposedToChangePassword(User user) {
-		return new UserProperties(user.getUserProperties()).isSupposedToChangePassword();
+		return Boolean.parseBoolean(user.getUserProperty(OpenmrsConstants.USER_PROPERTY_CHANGE_PASSWORD, "false"));
 	}
 
 	public String getPassword(User user) {

api/src/test/java/org/openmrs/module/adminui/account/AccountServiceComponentTest.java

@@ -9,31 +9,26 @@
  */
 package org.openmrs.module.adminui.account;
 
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Before;
 import org.junit.Test;
+import org.openmrs.Provider;
 import org.openmrs.User;
+import org.openmrs.api.ProviderService;
 import org.openmrs.api.UserService;
-import org.openmrs.api.context.Context;
-import org.openmrs.module.providermanagement.Provider;
-import org.openmrs.module.providermanagement.api.ProviderManagementService;
 import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.Assert.assertNotNull;
 
 public class AccountServiceComponentTest extends BaseModuleContextSensitiveTest {
-
+
+	@Autowired
 	private AccountService accountService;
-
+
+	@Autowired
 	private UserService userService;
-
-	private ProviderManagementService providerManagementService;
-
-	@Before
-	public void setup() {
-		userService = Context.getUserService();
-		accountService = Context.getService(AccountService.class);
-		providerManagementService = Context.getService(ProviderManagementService.class);
-	}
+
+	@Autowired
+	private ProviderService providerService;
 
 	/**
 	 * @verifies get all unique accounts
@@ -48,7 +43,7 @@ public void saveAccount_shouldSaveNewAccountWithAProviderAndUserAccount() throws
 		user.addRole(userService.getRole("Application Role: Archives"));//capability
 
 		Provider provider = new Provider();
-		provider.setProviderRole(providerManagementService.getProviderRole(1001));
+		provider.setProviderRole(providerService.getProviderRole(1001));
 		Account account = new Account(null);
 		account.setFamilyName("some");
 		account.setGivenName("tester");