Ate Douma pushed to branch master at cms-community / hippo-repository
Commits:
ab660c7a by Ate Douma at 2017-08-07T16:28:37+02:00
REPO-1758 Rename MigrateNodeTypesToV12 to MigrateToV12 as it is no longer about
just nodetype migration
- - - - -
3 changed files:
- engine/src/main/java/org/hippoecm/repository/LocalHippoRepository.java
- engine/src/main/java/org/hippoecm/repository/MigrateNodeTypesToV12.java →
engine/src/main/java/org/hippoecm/repository/MigrateToV12.java
- engine/src/test/java/org/hippoecm/repository/MigrateNodeTypesToV12Test.java →
engine/src/test/java/org/hippoecm/repository/MigrateToV12Test.java
Changes:
=====================================
engine/src/main/java/org/hippoecm/repository/LocalHippoRepository.java
=====================================
--- a/engine/src/main/java/org/hippoecm/repository/LocalHippoRepository.java
+++ b/engine/src/main/java/org/hippoecm/repository/LocalHippoRepository.java
@@ -286,7 +286,7 @@ public class LocalHippoRepository extends
HippoRepositoryImpl {
}
protected void migrateToV12IfNeeded(final Session rootSession, final
boolean dryRun) throws RepositoryException {
- new MigrateNodeTypesToV12(rootSession,
(HippoNodeTypeRegistry)jackrabbitRepository.getNodeTypeRegistry(), dryRun)
+ new MigrateToV12(rootSession,
(HippoNodeTypeRegistry)jackrabbitRepository.getNodeTypeRegistry(), dryRun)
.migrateIfNeeded();
}
=====================================
engine/src/main/java/org/hippoecm/repository/MigrateNodeTypesToV12.java →
engine/src/main/java/org/hippoecm/repository/MigrateToV12.java
=====================================
--- a/engine/src/main/java/org/hippoecm/repository/MigrateNodeTypesToV12.java
+++ b/engine/src/main/java/org/hippoecm/repository/MigrateToV12.java
@@ -43,9 +43,9 @@ import static
org.hippoecm.repository.api.HippoNodeType.NT_FACETRULE;
import static org.hippoecm.repository.api.HippoNodeType.NT_MODULE;
import static org.hippoecm.repository.api.HippoNodeType.NT_ROLE;
-class MigrateNodeTypesToV12 {
+class MigrateToV12 {
- static final Logger log =
LoggerFactory.getLogger(MigrateNodeTypesToV12.class);
+ static final Logger log = LoggerFactory.getLogger(MigrateToV12.class);
private static String DEPRECATED_NT_HIPPOSYS_AUTOEXPORT =
"hipposys:autoexport";
@@ -55,7 +55,7 @@ class MigrateNodeTypesToV12 {
private final NodeTypeManager ntm;
private final QueryManager qm;
- public MigrateNodeTypesToV12(final Session rootSession, final
HippoNodeTypeRegistry ntr, final boolean dryRun)
+ public MigrateToV12(final Session rootSession, final HippoNodeTypeRegistry
ntr, final boolean dryRun)
throws RepositoryException {
this.session = rootSession;
this.ntr = ntr;
=====================================
engine/src/test/java/org/hippoecm/repository/MigrateNodeTypesToV12Test.java →
engine/src/test/java/org/hippoecm/repository/MigrateToV12Test.java
=====================================
---
a/engine/src/test/java/org/hippoecm/repository/MigrateNodeTypesToV12Test.java
+++ b/engine/src/test/java/org/hippoecm/repository/MigrateToV12Test.java
@@ -40,13 +40,13 @@ import static org.junit.Assert.assertTrue;
@RunWith(EasyMockRunner.class)
@PowerMockIgnore("javax.management.*")
-public class MigrateNodeTypesToV12Test {
+public class MigrateToV12Test {
public static final String URL_REWRITER_SRC = "/content/urlrewriter";
public static final String URL_REWRITER_DEST =
"/hippo:configuration/hippo:modules/urlrewriter/hippo:moduleconfig";
private Session session;
- MigrateNodeTypesToV12 testedClass;
+ MigrateToV12 testedClass;
@Before
public void setUp() throws Exception {
@@ -62,13 +62,13 @@ public class MigrateNodeTypesToV12Test {
expect(workspace.getNodeTypeManager()).andReturn(typeManager).once();
replay(workspace);
- testedClass = new MigrateNodeTypesToV12(session, registry, false);
+ testedClass = new MigrateToV12(session, registry, false);
}
@Test
public void migrateUrlRewriter_nodes_do_not_exist() throws Exception {
- try (Log4jInterceptor interceptor =
Log4jInterceptor.onInfo().trap(MigrateNodeTypesToV12.class).build()) {
+ try (Log4jInterceptor interceptor =
Log4jInterceptor.onInfo().trap(MigrateToV12.class).build()) {
testedClass.migrateUrlRewriter();
assertTrue(interceptor.messages().anyMatch(m -> m.contains(
String.format("Source node %s does not exist, skipping
migrating url rewriter", URL_REWRITER_SRC))));
@@ -109,7 +109,7 @@ public class MigrateNodeTypesToV12Test {
expect(destinationNode.getProperty(propertyName)).andReturn(createNiceMock(Property.class));
replay(destinationNode);
- try (Log4jInterceptor interceptor =
Log4jInterceptor.onInfo().trap(MigrateNodeTypesToV12.class).build()) {
+ try (Log4jInterceptor interceptor =
Log4jInterceptor.onInfo().trap(MigrateToV12.class).build()) {
testedClass.migrateUrlRewriter();
assertTrue(interceptor.messages().anyMatch(m ->
m.contains("Migrating urlrewriter")));
assertTrue(interceptor.messages().anyMatch(m ->
m.contains(String.format("Migrating property '%s'", propertyName))));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/ab660c7a695a38428e46a298dcc3e33c3cc889dd
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/ab660c7a695a38428e46a298dcc3e33c3cc889dd
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
